conflict management too complicated and misleading

[dieterdreist]

it's been some time that I have been using conflict management, but it seems that current state is somehow broken.

1. I edited a way by adding oneway-property and deleted "created by potlatch"-tag
2. downloaded the same area. I got a conflict, where my version of "created by" was "<undefined><undefined>" (because I deleted the tag, but could be something more vocal like "tag deleted") I wonder why I got into conflict management, as there should be normally no conflict (afaik nobody else edited the same area in these 4 minutes)

additionally there was an almost cryptical window for resolving node conflicts. I get lots of node-numbers and should arrange them into an order (as far as I understood it). But orders are just for ways, not for nodes? The window was screwed up, so I could read all of it (even on resize, please see screenshot).