Merge conflict
What happens when two branches changed the same lines differently. Git marks the file with <<<<<<<, ======= and >>>>>>> lines and waits for a person to choose the correct result.
See it in context
Git and GitHub: Branches, merging and conflicts