Tried to resolve conflicts in .pbxproj file
Did not see any obviously divergent changes