testing the middleware
merged conflicts