Resolved merge conflict in js