diff --git a/src/mesh/wifi/WiFiAPClient.cpp b/src/mesh/wifi/WiFiAPClient.cpp
index b12e555f6..67ac19a26 100644
--- a/src/mesh/wifi/WiFiAPClient.cpp
+++ b/src/mesh/wifi/WiFiAPClient.cpp
@@ -503,8 +503,3 @@ uint8_t getWifiDisconnectReason()
 {
     return wifiDisconnectReason;
 }
-<<<<<<< master
-
-=======
-#endif
->>>>>>> master