diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h
index 196810aa99cc75c3e0d76fc0e179eff9b56bcd4a..823af1a9a2467667c87c7edb0ebba27b8d679225 100644
--- a/src/Vehicle/Vehicle.h
+++ b/src/Vehicle/Vehicle.h
@@ -402,10 +402,7 @@ private:
     int             _satelliteCount;
     int             _satelliteLock;
     int             _updateCount;
-<<<<<<< 39349c942a94b1a2714e3fb8818b82c455779861
     QString         _formatedMessage;
-=======
->>>>>>> Auto connect support
     int             _rcRSSI;
     double          _rcRSSIstore;