Resolved bug in which data was being lost

It turned out that resolving a conflict as a hashmap requires
that I add both nodes in the conflict ;)

Who would have thought?