diff --git a/code/__DEFINES/networks.dm b/code/__DEFINES/networks.dm
index 4d1e626fef..09b9e4cadf 100644
--- a/code/__DEFINES/networks.dm
+++ b/code/__DEFINES/networks.dm
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-#define HID_RESTRICTED_END 101		//the first nonrestricted ID, automatically assigned on connection creation.
-=======
 #define HID_RESTRICTED_END 101		//the first nonrestricted ID, automatically assigned on connection creation.
 
 #define NETWORK_BROADCAST_ID "ALL"
->>>>>>> 19ce08f... More integrated circuits and NTNET upgrade! (#37165)