The worst merge conflicts are ones where you have pbxproj conflicts!
2. now open your pbxproj with visual studio.
3. Now for the tricky choices. Command f to search the page for <<<<< .
4. Open github and figure out the pull request most recently modified the head for the pbxproj file. And then open your pull request. You can check side by side what is the intention of each file.
5. Delete the code you want and the indicators and leave the code you want.
6. when you are done, save your changes.
7. Open your project.
