main.js merged