Add conflict statements to sensor and sensor-kinect