title: TFS Build : the auto merge oprtion is not supported for the conflict on item
body: <p>Whenever I run my build it fails with this error message:</p>
  
  <p>"The auto merge oprtion is not supported for the conflict on item ManagementService.cs"</p>
  
  <p>How can I solve this?</p>