deleted admine name space and extra migration files
fixed conflicts