diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 61f5a12a81..f0e7ee0668 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -1,5 +1,11 @@
+<<<<<<< HEAD
 /obj/machinery/r_n_d/server
 	name = "R&D Server"
+=======
+/obj/machinery/rnd/server
+	name = "\improper R&D Server"
+	desc = "A computer system running a deep neural network that processes arbitrary information to produce data useable in the development of new technologies. In layman's terms, it makes research points."
+>>>>>>> 5d9231a... Gives the R&D Server a description and makes its name improper (#32955)
 	icon = 'icons/obj/machines/research.dmi'
 	icon_state = "server"
 	var/datum/research/files