corrected merge of filling-in-layout
want to merge filling layout
corrected routes.rb