One of the 100 questions in this topic
A merge conflict occurs when two changes on the same line of code in a file cannot be combined automatically.