Merged the xcode project file