Report question

Question: In git merge conflicts, how do I keep the version that is being merged in?