Composite-based conflict resolution in merging versions of UML models | IEEE Conference Publication | IEEE Xplore