Adding conflict section
Adding conflict section

moufmouf/harmony,moufmouf/harmony,thecodingmachine/harmony,moufmouf/harmony,thecodingmachine/harmony,thecodingmachine/harmony,moufmouf/harmony,thecodingmachine/harmony