Merge Conflict

A merge conflict happens when Git can't automatically combine two branches because the same lines of a file were changed differently in each.