title: Merge conflict marker encountered
body: <p><strong>SourceTree Merge Conflict</strong></p>
  
  <p>I have created a local <strong>"Test"</strong> branch in <em>SourceTree</em> for testing some new features and everything seemed to work fine. Then I merged the <strong>"master"</strong> branch into my local <strong>"Test"</strong> branch and unfortunately, pushed it. But since then by running <strong>"ng serve"</strong> I'm getting the following error:    </p>
  
  <pre><code>
  52 &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  app/app.module.ts:54:1 - error TS1185: Merge conflict marker encountered.
  
  54 =======
  app/app.module.ts:56:1 - error TS1185: Merge conflict marker encountered.
  
  56 &gt;&gt;&gt;&gt;&gt;&gt;&gt; master
  app/example/example.module.ts:9:1 - error TS1185: Merge conflict marker encountered.
  
  9 &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  </code></pre>
  
  <p>I have no idea what's going on here. Is there any way to solve this issue easily?</p>