diff -r 000000000000 -r 8083d21c0020 web/html/support/figs/bad-merge-4.png
Binary file web/html/support/figs/bad-merge-4.png has changed