diff --git a/src/pregmod/fDick.tw b/src/pregmod/fDick.tw
index e5da46b232f385828ac169c360b3a6e2b352608e..997b05153f8c86b9e6625cd3c01ad87c100bfbdc 100644
--- a/src/pregmod/fDick.tw
+++ b/src/pregmod/fDick.tw
@@ -55,11 +55,7 @@
 	<<else>>
 		hypertrophied
 	<</if>>
-<<<<<<< HEAD
-	dick, savoring every centimeter,
-=======
-	 dick, savoring every <<if $showInches == 2>>inch<<else>>centimeter<</if>>, 
->>>>>>> b612f74c6f47e0427e0a22afdbc861305431ff0a
+	dick, savoring every <<if $showInches == 2>>inch<<else>>centimeter<</if>>,
 	<<if $activeSlave.dick <= 6>>
 		until you find yourself hilted and sitting on $his pelvis.
 	<<else>>
diff --git a/src/pregmod/widgets/deathWidgets.tw b/src/pregmod/widgets/deathWidgets.tw
index 2e34bbd813b886164cd2013481187fbbcddb40d3..afe6a5f73a7ea9aa87f2a3511dbd8f95be8baaa3 100644
--- a/src/pregmod/widgets/deathWidgets.tw
+++ b/src/pregmod/widgets/deathWidgets.tw
@@ -117,11 +117,7 @@ As $args[0].slaveName is going about $his business with $his overfilled $args[0]
 		<</if>>
 		<<if $arcologies[0].FSPaternalist != "unset">>
 			Allowing a slave to die under your care @@.red;severely damages@@ your image as a caring slaveowner and @@.red;calls into question@@ your paternalistic resolve.
-<<<<<<< HEAD
-			<<= FSChange("Paternalist", -10)>>			
-=======
 			<<= FSChange("Paternalist", -10)>>
->>>>>>> a94d26a4b0a9f518bf648ba578fd53051afdbac8
 		<</if>>
 	<</if>>
 <</widget>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 6579614ea3a8844dbcb63e6291f95dff1721af45..a8caaed8b4b56053dbe7bdc458e720df32eaca1d 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -13109,11 +13109,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
 <<link "Join $him and see if your hands can span $his waist">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-	By the time you reach the shower, $activeSlave.slaveName is toweling $himself. $He notices your approach and folds the towel neatly before performing a little naked pirouette that shows off her artificial
-=======
-	By the time you reach the shower, $activeSlave.slaveName is toweling $himself. $He notices your approach and folds the towel neatly before performing a little naked pirouette that shows off her artificial 
->>>>>>> b612f74c6f47e0427e0a22afdbc861305431ff0a
+	By the time you reach the shower, $activeSlave.slaveName is toweling $himself. $He notices your approach and folds the towel neatly before performing a little naked pirouette that shows off $his artificial
 	<<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
 		curviness while displaying each of her delectable holes.
 	<<elseif canDoVaginal($activeSlave)>>