Test if merge conflict