Fixed

src/npc/newSlaveIncestSex.tw

@@ -21,21 +21,12 @@
 	<<set _one = relativeTerm($relative2, $relative)>> /* relative is relative2's blank */
 	<<set _other = relativeTerm($relative, $relative2)>> /* relative2 is relative's blank */
 <<else>>
-<<<<<<< HEAD
 	<<if $relative.actualAge == $relative2.actualAge>>
 		<<set _one = "twin">>
 		<<set _other = "twin">>
 	<<else>>
-		<<set _one = $relative.relation >>
-		<<set _other = $relative2.relation >>
-=======
-	<<if $sissy.actualAge == $activeSlave.actualAge>>
-		<<set _one = "twin">>
-		<<set _other = "twin">>
-	<<else>>
-		<<set _one = $sissy.relation >>
-		<<set _other = $activeSlave.relation >>
->>>>>>> 43df0d9e6f3e897b6afd54ef72ed2f09ccf5f024
+		<<set _one = $relative.relation>>
+		<<set _other = $relative2.relation>>
 	<</if>>
 <</if>>