created more pages, controllers
fixed merge conflict