title: Cocoapods error: "Pull is not possible because you have unmerged files."
body: <p>When installing a new CocoaPod, I got the following error.</p>
  
  <pre><code>$ pod install
  Analyzing dependencies
  [!] Pod::Executable pull
  
  A   AFHARchiver/0.2.1/AFHARchiver.podspec
  
  A   AFWunderlist/1.0/AFWunderlist.podspec
  
  A   AFWunderlist/1.1/AFWunderlist.podspec
  
  A   AFgzipRequestSerializer/0.0.1/AFgzipRequestSerializer.podspec
  </code></pre>
  
  <p>.
    .
    .</p>
  
  <pre><code>A   wpxmlrpc/0.4/wpxmlrpc.podspec
  
  A   zipzap/6.0/zipzap.podspec
  Pull is not possible because you have unmerged files.
  
  Please, fix them up in the work tree, and then use `'git add/rm &lt;file&gt;'`
  
  as appropriate to mark resolution, or use `'git commit -a'`.
  </code></pre>
  
  <p>Thought I would share the fix below.</p>