title: Git Error in Rails
body: <p>I am trying to merge in git and get the following error: </p>
  
  <pre><code>"error: The following untracked working tree files would be overwritten by merge:
      app/.DS_Store
  Please move or remove them before you can merge.
  Aborting"
  </code></pre>
  
  <p>Any help would be appreciated. </p>