add admin redirect
fix conflicts