changes for routes
conflist resolved for routes