First merge conflict check