Make sure you resolve any merge conflicts in files of Project.xcodeproj or any other file used by Xcode.