added cup/lidar merger