Merge controllers.js