Conflicts: public/scripts/app.js public/scripts/min/app.js public/styles/app.css public/version script/server