updated UML Class
merging