added controller.js
fix merge