Nicer conflict markers

Created by  pmeunier  on December 8, 2021
GA3P7FOMATKDOGCZDYWLZJHAUNOWMRIP3BXTYFEH7PNWTTYYVLIAC
Change contents