check merge conflict