conflicts: refactor conflict marker writing and parsing

These changes make the code a bit more readable, and they will make it
easier to have conflict markers of different lengths in the next commit.