diff --git a/sdk/plugins/stasm.cpp b/sdk/plugins/stasm.cpp
index 966726b..afc88d4 100644
--- a/sdk/plugins/stasm.cpp
+++ b/sdk/plugins/stasm.cpp
@@ -1,6 +1,14 @@
 #include <QProcess>
+<<<<<<< HEAD
 #include <stasm_dll.hpp>
 #include <opencv2/highgui/highgui.hpp>
+=======
+
+#include <stasm/stasm_dll.hpp>
+
+#include <opencv2/highgui/highgui.hpp>
+
+>>>>>>> 9cfbe4a6bc2e683ed8be044b5007ddcfcfcfcd23
 #include <openbr_plugin.h>
 
 using namespace cv;
@@ -58,6 +66,8 @@ class StasmTransform : public UntrainableTransform
                      src.file.name.toStdString().c_str(), reinterpret_cast<char*>(src.m().data), src.m().cols, src.m().rows,
                      src.m(), (src.m().channels() == 3), qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-68-1d.conf"),  qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-76-2d.conf"));
 
+
+
         if (nlandmarks == 0) qFatal("Unable to detect Stasm landmarks");
 
         for (int i = 0; i < nlandmarks; i++)