Merge proposals

diagramviewer has no merge proposals.