here's a thing you can do: pepper your code with comments that contain the text "<<<<<<< HEAD" (I did not encounter this in the wild, this is just an idea I had right now)