commit last changes
Finishing layout and routes
Solving conflicts