merge conflic pbxproj