removed merge conflicst from main.js