It would be nice to have support for conflict marks. ``` <<<<<<< ======= >>>>>>> ```
It would be nice to have support for conflict marks.