title: Xcode tree conflicts on merge
body: <p>I'm working in team with git and every time we try to merge code we have a tree conflict.
  We're currently working with git flow and we usually start features from develop, when the task is finished one of us merges one feature into the other and then merge it into develop.
  The problem is than every time we try to merge one feature into another we have a tree conflict in xcode and we don't know how to fix it.</p>
  
  <p>The error message is: "The operation could not be performed because of one or more tree conflicts."</p>