Resolved merge conflics
Compiled JS