diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index f63250c1b45a549ca25f013ff8e0bcb336eb49ec..4d7ec903ab9478d092d96716c349bdd33c3e0886 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -3409,11 +3409,7 @@
 				<<set $slaves[$i].butt += 1>>
 			<</if>>
 		<</if>>
-<<<<<<< HEAD
 	<<elseif ($slaves[$i].preg > 25) && ($slaves[$i].pregType >= 10)>>
-=======
-	<<elseif ($slaves[$i].preg > 25) && ($slaves[$i].pregType >= 10)>>
->>>>>>> upstream/pregmod-master
 		<<if random(1,100) > 80 && (($slaves[$i].boobs - $slaves[$i].boobsImplant) < 7500)>>
 			$possessiveCap breasts @@.lime;swell@@ in preparation for $possessive growing brood.
 			<<set $slaves[$i].boobs += 150>>