Merge pull request #128 from logxen/edge

fixed merge error from the rename of Conveyor