Resolve merge conflicts by hand

When two branches change the same line, `git merge` stops with conflict markers. Edit the file, stage it, and commit to finish the merge.