having an issue with routes
merged conflict with diff routes