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