Conflict resolution

Conflicts were nightmare

>>> YOUR VERSION
....
=== ORIGINAL VERSION x
....
=== THEIR VERSION x
....
<<< THEIR VERSION y