merge upstream + xcode project