Conflict resolution

Traditionally conflicts mean nightmare

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

Even with just whitespace change!