Tag: formal conflict resolution and traditional conflict resolution