Get rid of 'git merge' trash in web.js