Updated conflict.md

Ciro Santilli Puppet 1 authored
revision 4b1f1dba1c34b3ab8144da84d014a3a2b73645e3
conflict
a
b2
c
d
e
f
g2
h