One of the 100 questions in this topic
A conflict occurs when two branches have made changes to the same part of the code.