Tag: global conflict resolution framework