diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h
index 5565f7430..e2f1fa55b 100644
--- a/src/blackcore/context_network.h
+++ b/src/blackcore/context_network.h
@@ -62,7 +62,6 @@ namespace BlackCore
         //! Aircraft list has been changed
         void changedAircraftsInRange();
 
-<<<<<<< HEAD
         /*!
          * \brief Aircraft situation update
          * \param callsign