Report question

Question: What constitutes a merge conflict in Git?