Changes in class diagram
Fixed merge conflicts