diff --git a/autonomousCar/autonomousCar.ino b/autonomousCar/autonomousCar.ino
index c0e76cd..b0b56de 100644
--- a/autonomousCar/autonomousCar.ino
+++ b/autonomousCar/autonomousCar.ino
@@ -282,11 +282,8 @@ int Serial_Input()
 
 void loop() {
   // Calculating the distance
-<<<<<<< HEAD
   //distance= getDistance();
-=======
-  distance= getDistance();
+  //distance= getDistance();
   park(Serial_Input());
->>>>>>> b0babf3fb5efd5a1eaec732fcec23eef4b0d8956
   
 }