title: Merging tree conflict on XCode
body: <p>I'm coding on XCode 8.2.1 and I get the following error when I try to merge two branches:</p>
  
  <p><a href="https://i.stack.imgur.com/ohCyq.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/ohCyq.png" alt="enter image description here"></a></p>
  
  <p>Does anyone know why is it happening? And how could it be solved?</p>
  
  <p>pd: Tried to add "xcschememanagement.plist" to .gitignore, but not solved</p>
  
  <p>Thank you!</p>