built js and uncommented debugger config
solved merge conflicts