title: VS Team Explorer merge conflicts
body: <p>When merging our develop branch into my feature branch <code>develop --&gt; feature</code> in <code>Visual Studio</code>, I get a merge conflict.<br>
  I have the possibility to choose from <code>Take Source</code> and <code>Keep Target</code>.    </p>
  
  <p>I want to take the file from the <code>develop</code> branch. Which one is the correct option? </p>
  
  <p><a href="https://i.stack.imgur.com/io4LS.png" rel="noreferrer"><img src="https://i.stack.imgur.com/io4LS.png" alt="enter image description here"></a></p>