Fixing merge remnants in pbxproj file.