conflict markers

Also written: <<<<<<<, =======

The `<<<<<<<`, `=======` and `>>>>>>>` lines Git writes into a file during a conflict, showing both competing versions. You delete them after choosing the final text.