Finish conflicts resolving
Finish layouts and routes