Delete controllers.js.conflict