begin documentation on merge conflicts and resolutions
more stories into how a merge conflict can happen.
flow and punctuation
let's consistently talk about version names first, then hashes second