created diagram model
merged changes