Testmerge Conflict fix?

code/modules/modular_computers/NTNet/NTNRC/conversation.dm

@@ -1,3 +1,5 @@
+#define MAX_CHANNELS 1000
+
 /datum/ntnet_conversation
 	var/id = null
 	var/title = "Untitled Conversation"
@@ -8,7 +10,11 @@
 	var/static/ntnrc_uid = 0
 
 /datum/ntnet_conversation/New()
-	id = ntnrc_uid++
+	id = ntnrc_uid + 1
+	if(id > MAX_CHANNELS)
+		qdel(src)
+		return
+	ntnrc_uid = id
 	if(SSnetworks.station_network)
 		SSnetworks.station_network.chat_channels.Add(src)
 	..()
@@ -66,3 +72,5 @@
 
 	add_status_message("[client.username] has changed channel title from [title] to [newtitle]")
 	title = newtitle
+
+#undef MAX_CHANNELS