fixed merge error from the rename of Conveyor