Finish layout and routes
conflict rm
add application.html.erb