MPS-20972 "resolve nonconflicting" button on Files Merged with Conflicts dialog