merge in main.js