Merge conflict resolution: Applying project.pbxproj from 1.1.2-beta branch.