updated UML
update UML again
bin conflict resolution
more conflicts
force UML updates
conflicts
more bin conflicts
resolved compiler errors