Enriching conflict resolution environments with the provision of context information