Testing merge issue with Xcode and git