now it compiles.

code/__DEFINES/~ff_defines/__HELPERS/names.dm

@@ -38,16 +38,10 @@
 			if(1)//1 and 2 can only be selected once each to prevent more than two specific names/places/etc.
 				switch(rand(1,2))//Mainly to add more options later.
 					if(1)
-						if(names.len && prob(70))
+						if(length(names) && prob(70))
 							. += pick(names)
 						else
-							if(prob(10))
-								. += pick(lizard_name(MALE),lizard_name(FEMALE))
-							else
-								var/new_name = pick(pick(GLOB.first_names_male,GLOB.first_names_female))
-								new_name += " "
-								new_name += pick(GLOB.last_names)
-								. += new_name
+							. += generate_random_name()
 					if(2)
 						var/datum/job/job = pick(SSjob.joinable_occupations)
 						if(job)

code/__HELPERS/global_lists.dm

@@ -54,7 +54,6 @@
 	sort_list(GLOB.laugh_types, GLOBAL_PROC_REF(cmp_typepaths_asc))
 	// NOVA EDIT ADDITION END
 
-<<<<<<< HEAD
 	//THE FLUFFY FRONTIER EDIT ADDITION BEGIN - Blooper
 	for(var/sound_blooper_path in subtypesof(/datum/blooper))
 		var/datum/blooper/B = new sound_blooper_path()
@@ -63,15 +62,6 @@
 			GLOB.blooper_random_list[B.id] = sound_blooper_path
 	//THE FLUFFY FRONTIER EDIT END
 
-/// Inits GLOB.species_list. Not using GLOBAL_LIST_INIT b/c it depends on GLOB.string_lists
-/proc/init_species_list()
-	for(var/species_path in subtypesof(/datum/species))
-		var/datum/species/species = new species_path()
-		GLOB.species_list[species.id] = species_path
-	sort_list(GLOB.species_list, GLOBAL_PROC_REF(cmp_typepaths_asc))
-
-=======
->>>>>>> 7296d5d50b6 ([MIRROR] Random Name Generation refactor, generate random names based on languages (for species without name lists, like Felinids and Podpeople) (#2314))
 /// Inits GLOB.surgeries
 /proc/init_surgeries()
 	var/surgeries = list()

tff_modular/modules/nabbers/code/_nabbers.dm

@@ -163,14 +163,6 @@
 
 	return perk_descriptions
 
-/datum/species/nabber/random_name(gender, unique, lastname)
-	if(unique)
-		return random_unique_name(gender)
-
-	var/random_name
-	random_name += (pick("Alpha","Delta","Dzetta","Phi","Epsilon","Gamma","Tau","Omega") + " [rand(1, 199)]")
-	return random_name
-
 /datum/species/nabber/get_species_description()
 	return placeholder_description