diff --git a/app/src/main/cpp/SensorsProtocol.cpp b/app/src/main/cpp/SensorsProtocol.cpp
index 49e354f0..b4c99e30 100644
--- a/app/src/main/cpp/SensorsProtocol.cpp
+++ b/app/src/main/cpp/SensorsProtocol.cpp
@@ -1074,12 +1074,7 @@ void testComm()
 	for (;;)
 	{
 #if COLLECT_DATA
-<<<<<<< HEAD
       Collect_sensor_data();
-=======
-
-		Collect_sensor_data();
->>>>>>> cf0f3f52d373254ad85da3aa96b1e8c8f7c34070
 #else
 		sleep(15);
 		CameraPhotoCmd(time(NULL), 1, 0, 6, 1, "/dev/ttyS1",38400, 1);