title: github add <<<<<<< HEAD
body: <p>hi i'm fairly new to github, when i made some changes to the code and then merge to upstream, if there are any conflicts,it will do the following.</p>
  
  <pre><code>Auto-merging Global.asax.cs CONFLICT (content): Merge conflict in Global.asax.cs
  
  &lt;&lt;&lt;&lt; HEAD
  ======
  &gt;&gt;&gt;&gt; UPSTREA/MASTER
  </code></pre>
  
  <p>into my code. does anyone know why? and how to get rid of them?
  Cheers</p>