merge conflict apple