title: error when trying to modify project in laravel forge
body: <p>My project is in laravel forge with digitalocean
  first I added a collaborator and deleted it and since when I try to modify code  by git push origin master 
  I receive this error in the dashboard of laravel forge</p>
  
  <pre><code>From github.com:name/project
   * branch            master     -&gt; FETCH_HEAD
     aad781c..e558842  master     -&gt; origin/master
  error: Your local changes to the following files would be overwritten by merge:
      public/css/style.css
  Please, commit your changes or stash them before you can merge.
  Aborting
  Updating aad781c..e558842
  </code></pre>
  
  <p>now I receive a new message </p>
  
  <pre><code>From github.com:project/name
   * branch            master     -&gt; FETCH_HEAD
     be3f227..aeddc3a  master     -&gt; origin/master
  Auto-merging .idea/workspace.xml
  CONFLICT (add/add): Merge conflict in .idea/workspace.xml
  Automatic merge failed; fix conflicts and then commit the result.
  </code></pre>
  
  <p>please any help will be appreciated Thanks</p>