fix merge conflict
fix merge conflict
merge conflict, add OP_HID to the op registry