Making merge conflicts like a dirty hoe
Undo