Test for Commit Merge Conflicts