Keywords: Conflict resolution