Fix the conflict

samples/tutorials/util/cv_painter.cc

@@ -13,15 +13,25 @@
 // limitations under the License.
 #include "util/cv_painter.h"
 
+<<<<<<< HEAD
 #include <opencv2/imgproc/imgproc.hpp>
 
+=======
+>>>>>>> origin/develop
 #include <iomanip>
 #include <iostream>
 #include <memory>
 #include <utility>
 
+<<<<<<< HEAD
 #include "mynteye/logger.h"
 #include "mynteye/utils.h"
+=======
+#include <opencv2/imgproc/imgproc.hpp>
+
+#include "mynteye/logger.h"
+#include "mynteye/device/utils.h"
+>>>>>>> origin/develop
 
 #define FONT_FACE cv::FONT_HERSHEY_PLAIN
 #define FONT_SCALE 1
@@ -178,7 +188,7 @@ cv::Rect CVPainter::DrawText(
   y += offset_y;
 
   cv::Point org(x, y);
-#ifdef USE_OPENCV2
+#ifdef WITH_OPENCV2
   cv::putText(
       const_cast<cv::Mat &>(img), text, org, FONT_FACE, FONT_SCALE, FONT_COLOR,
       THICKNESS);

samples/tutorials/util/cv_painter.h

@@ -15,10 +15,10 @@
 #define MYNTEYE_TUTORIALS_CV_PAINTER_H_
 #pragma once
 
-#include <opencv2/core/core.hpp>
-
 #include <string>
 
+#include <opencv2/core/core.hpp>
+
 #include "mynteye/types.h"
 
 class CVPainter {

samples/tutorials/util/pc_viewer.h

@@ -15,12 +15,12 @@
 #define MYNTEYE_TUTORIALS_PC_VIEWER_H_
 #pragma once
 
+#include <memory>
+
 #include <opencv2/core/core.hpp>
 
 #include <pcl/visualization/pcl_visualizer.h>
 
-#include <memory>
-
 class PCViewer {
  public:
   PCViewer();