From cc1b82c574712720b007d4c2c01b09b17584c513 Mon Sep 17 00:00:00 2001
From: Samuel Felton <samuel.felton@irisa.fr>
Date: Wed, 28 Aug 2024 20:46:27 +0200
Subject: [PATCH] remove merge tag in render set, add missing include directive

---
 modules/ar/src/panda3d-simulator/vpPanda3DRendererSet.cpp | 1 -
 modules/tracker/me/src/moving-edges/vpMeSite.cpp          | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ar/src/panda3d-simulator/vpPanda3DRendererSet.cpp b/modules/ar/src/panda3d-simulator/vpPanda3DRendererSet.cpp
index 26e2113557..7b3600e9a1 100644
--- a/modules/ar/src/panda3d-simulator/vpPanda3DRendererSet.cpp
+++ b/modules/ar/src/panda3d-simulator/vpPanda3DRendererSet.cpp
@@ -216,5 +216,4 @@ void vpPanda3DRendererSet::enableSharedDepthBuffer(vpPanda3DBaseRenderer &source
 // Work around to avoid warning: libvisp_ar.a(vpPanda3DRendererSet.cpp.o) has no symbols
 void dummy_vpPanda3DRendererSet() { };
 
->>>>>>> upstream/master
 #endif
diff --git a/modules/tracker/me/src/moving-edges/vpMeSite.cpp b/modules/tracker/me/src/moving-edges/vpMeSite.cpp
index 990e386d5e..ba4a9473e5 100644
--- a/modules/tracker/me/src/moving-edges/vpMeSite.cpp
+++ b/modules/tracker/me/src/moving-edges/vpMeSite.cpp
@@ -39,6 +39,7 @@
 #include <cmath>  // std::fabs
 #include <limits> // numeric_limits
 #include <stdlib.h>
+#include <map>
 #include <visp3/core/vpTrackingException.h>
 #include <visp3/me/vpMe.h>
 #include <visp3/me/vpMeSite.h>