PatchActions and ChangeHunks that are identical conflict

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

added onlyOne hof and updated noConflicts accordingly