Add conveyor constants
Fix merge conflict in constants