Resolved merge conflict
Added dependency