Update views and controller
Fix merge conflict