update the single.js file
merge conflict fixed