update controllers, routes, models and htmls pages
fixed conflicts