compositions to associations
fix merges uml