fixed error with active admin / merge with user model