working on main.js
working on main.js, resolved merge conflicts