Checking the merge conflict resolution