Added j
Resolved merge