fixed merge conflicts with main.js