# Resolving merge conflicts

When two branches change the same lines, git leaves markers in the file:

```text
<<<<<<< HEAD
the version on your branch
=======
the version being merged in
>>>>>>> other-branch
```

Delete the markers and keep the text you want.

## Conflict styles

<<<<<<< HEAD
Set `merge.conflictStyle` to `zdiff3` for the clearest output.
=======
Set `merge.conflictStyle` to `diff3` to see the merge base.
>>>>>>> feature/retry-budget

Both settings are per-repository.