delete controller.min.js
merge