merge conflict apple
solved merge conflict