Deal with conflict

Deal with conflict
Active — user can report