updating routes to resolve conflicts