Some routes and conflicts resolved