Update controllers.js

remove merge conflict indicator