removed existing conflict from feature/userauthorization