finished layout and routes
resolved conflict