fix merge of RenameDiagramOperation