title: iOS - git merge conflicts after adding cocoapods to project
body: <p>I'm working on an app with another partner. He's been working on master, and I started a new branch. On my branch I installed <code>cocoapods</code>. I just tried pulling from master and I'm getting merge conflicts.</p>
  
  <p>When I open up Xcode, the workspace file has an error and it says:</p>
  
  <pre><code>"Workspace Integrity - Couldn't load project"
  </code></pre>
  
  <p>How can I solve this merge conflict?</p>