PatchActions and ChangeHunks that are identical conflict

This is because abstractly this makes sense, two identical
patches do conflict, but are merged trivially.

THIS BREAKS TEST CASES in Test.hs. Need to figure out a
workaround for noConflicts (because a patch now conflicts
with itself)