Conflict Resolution Service