rewrite of MergeNodesAction new: new conflict resolution dialog for conflicts during node merging. Can resolve conflicts in relation members too.