Flexible Definition and Resolution of Conflicts through Multi-level Editing | IEEE Conference Publication | IEEE Xplore