Resolve merge conflict
Resolve merge conflict

microsoft/Azure-Kinect-Sensor-SDK,microsoft/Azure-Kinect-Sensor-SDK,microsoft/Azure-Kinect-Sensor-SDK,microsoft/Azure-Kinect-Sensor-SDK,microsoft/Azure-Kinect-Sensor-SDK,microsoft/Azure-Kinect-Sensor-SDK