Updated main.js file
Fixed merge conflict