fix in xcodeproj after merge problem