Improving conflict resolution in model versioning systems | IEEE Conference Publication | IEEE Xplore