resolved merge conflict
Taking HEAD version instead of master.