conflict

Also written: merge conflict, merge conflicts

What happens when two branches changed the same lines and Git can't tell which version is right. You edit the file to the correct version, then `git add` and `git commit`.