merge conflict error