more obvious difference between our test screenshots for testSimpleConflictingMerge; some outstanding refactoring in Monticello-UI
merge