diff --git a/car.cpp b/car.cpp
index a837ad0..f4c1655 100644
--- a/car.cpp
+++ b/car.cpp
@@ -148,18 +148,9 @@ void Car::followPath()
         break;
     case Road::queueHead:
         Log::i("发送请求车位信号");
-<<<<<<< HEAD
-<<<<<<< HEAD
         emit queueHead(this);
         crash=false;
-=======
-        // emit queueHead(this);
-        emit back(this);
->>>>>>> parent of ff06e82... Merge branch 'master' of github.com:w-mj/DataStructureProject
-=======
-        // emit queueHead(this);
-        emit back(this);
->>>>>>> parent of ff06e82... Merge branch 'master' of github.com:w-mj/DataStructureProject
+        // emit back(this);
         break;
     case Road::none:
         break;