Update main.js
now
merge