diff -r 672eaaab9204 -r 52d12eb31c30 SEESenv/web/html/support/figs/bad-merge-1.png Binary file SEESenv/web/html/support/figs/bad-merge-1.png has changed