Finish layout and routes
Finish layout and routes - conflicts