admin validation
fix conflict