Merge conflict

## What it means

When two branches changed the same lines in different ways, Git can't tell which version to keep, so it stops and asks a person to decide.