add class diagram
merge