worked on diagrams
fixed merge conflict
live diagramm is working smooth