Solving conflicts and changing admins email