conflict test
commit button should work with either files of outstanding merges
menu item with .file.merging does an either-or match
changes as currently in master