Added conflict check in admin approval