title: The files .DS_Store and .DS_Store had a tree conflict error from Git in xcode 8
body: <p>I'm using GitHub as project repository for ios project. But whenever I'm trying to pull project from xcode 8 I'm getting the following error:</p>
  
  <blockquote>
    <p>The files .DS_Store and .DS_Store had a tree conflict</p>
  </blockquote>
  
  <p>Any solution?</p>