moving conflicts to the admin