diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b48f35..e7f0050 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,9 +6,14 @@ if(UNIX)
 endif()
 
 if(SIM)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSIMULATION=1 -DMAVROSKINETIC=1")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSIMULATION=1")
 else()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSIMULATION=0 -DMAVROSKINETIC=1")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSIMULATION=0")
+endif()
+if(KIN)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMAVROSKINETIC=1")
+else()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMAVROSKINETIC=0")
 endif()
 ## Find catkin macros and libraries
 find_package(catkin REQUIRED COMPONENTS
diff --git a/include/buzzuav_closures.h b/include/buzzuav_closures.h
index 7a5bfa2..f1d1852 100644
--- a/include/buzzuav_closures.h
+++ b/include/buzzuav_closures.h
@@ -92,7 +92,6 @@ void set_filtered_packet_loss(float value);
 
 void set_currentNEDpos(double x, double y);
 
->>>>>>> 064760108611591426d86c679c7789b1a95cebee
 void set_currentpos(double latitude, double longitude, float altitude, float yaw);
 /*
  * returns the current go to position