corrected controller.js merge issue