diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 67587d15a0fbc2bdc6cd6e4cc5b863cc7b835a66..e7963ff7fe32408ea5764e755576b6152ed68f0b 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -3049,13 +3049,8 @@
 				Allowing $him to indulge in $his fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@
 				<<FSChange "Hedonism" 2>>
 			<</if>>
-<<<<<<< HEAD
 		<<elseif $slaves[$i].bellyPreg > 100 && $slaves[$i].pregKnown == 1 && $slaves[$i].pregSource == -1 && $slaves[$i].breedingMark == 1 && $slaves[$i].devotion > 75>>
 			$He's been marked to be the bearer of your offspring and is growing larger by the day with your child. $He is to be nothing more than a vessel for your children, and as such @@.yellow;has become obsessed with carrying them.@@
-=======
-		<<elseif $slaves[$i].bellyPreg > 100 && $slaves[$i].pregKnown == 1 && $slaves[$i].pregSource == -1 && $slaves[$i].breedingMark == 1 && $propOutcome == 1 && $slaves[$i].devotion > 75>>
-			She's been marked to be the bearer of your offspring and is growing larger by the day with your child. She is to be nothing more than a vessel for your children, and as such @@.yellow;has become obsessed with carrying them.@@
->>>>>>> 7c151cf7d5f947331cc64a6097fa3db9575ff5df
 			<<set $slaves[$i].sexualFlaw = "breeder">>
 			<<set $slaves[$i].fetishStrength = 100>>
 			<<if $arcologies[0].FSHedonisticDecadence != "unset">>
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index f3432bd5b0ef2dff98b5fd108966b03f4b18f5b6..867ed764ec08cad910cd344b348a5f9ab39ee033 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -533,7 +533,7 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea
 		<<elseif $slaves[$j].relationship > 4>>
 			slave wife
 		<</if>>
-		$slaves[$j].slaveName is also serving the public and they work well toget$him.
+		$slaves[$j].slaveName is also serving the public and they work well together.
 	<</if>>
 <<elseif $slaves[$i].relationship == -1>>
 	$He relies on citizens' desire to fuck $him for emotional support, making $him an excellent, if occasionally disturbing, slut.