changes public/controllers
merge conflicts