class diagram
merge?