title: Conflict in merging
body: <p>I have some troubles in my project angular. Who can help me ?</p>
  
  <blockquote>
    <p>ERROR in src/app/app-routing.module.ts(5,1): error TS1185: Merge conflict marker encountered.</p>
  </blockquote>