This will make merge conflicts actually dealable. https://medium.com/macoclock/stop-resolving-merge-conflicts-in-pbxproj-51e749759b8b