title: Getting rid off "File still marked as conflicted" warning in Xcode
body: <p>I would like to remove the warning. It is not easy to find the point which causes this warning. There is no log in xcode after clicking on the yellow icon, just a blank page. The warning is in the project file, not the workspace file. It is also not related to the current git state. The information about the conflict is stored somewhere in the .xcodeproj. But I could not find any related line. I suspect it was caused by a canceled merge (the process could not be finished) from Xcode.</p>
  
  <p>XCode 6.4, git version 2.3.2 (Apple Git-55)</p>
  
  <p><a href="https://i.stack.imgur.com/zULsc.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/zULsc.png" alt="enter image description here"></a></p>
  
  <p>I can not remove the warning via the menu:</p>
  
  <p><a href="https://i.stack.imgur.com/fQZIA.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/fQZIA.png" alt="enter image description here"></a></p>
  
  <p>It looks like a zombie warning from a previous conflict that is stored somewhere. I tried to</p>
  
  <ul>
  <li>remove the workspace file and create a new one (with pod install)</li>
  <li>I have searched everywhere for &lt;&lt;&lt;&lt;&lt; or >>>>> or "conflict" lines</li>
  <li>searched in the project file for any clue related to the TSNLocalEntityCompetition</li>
  <li>removed the xcuserdata file from .xcodeproj package</li>
  <li>removed folders with derivates, cleaned project, the warning is still there</li>
  </ul>
  
  <p>I can build the project and run the application without problem.</p>
  
  <p>git status</p>
  
  <pre><code>On branch master
  Your branch is up-to-date with 'origin/master'.
  Changes not staged for commit:
  (use "git add &lt;file&gt;..." to update what will be committed)
  (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
  
  modified:   TSN.xcworkspace/xcshareddata/TSN.xccheckout
  modified:   TSN.xcworkspace/xcuserdata/slavik.xcuserdatad/UserInterfaceState.xcuserstate
  
  no changes added to commit (use "git add" and/or "git commit -a")
  </code></pre>