diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
deleted file mode 100644
index c33202c1f409ce09fcd9b929a822ea56dfbd480d..0000000000000000000000000000000000000000
--- a/src/facilities/nursery/longChildDescription.tw
+++ /dev/null
@@ -1,1502 +0,0 @@
-:: Long Child Description [nobr]
-
-/*TODO: This may need rewriting — a lot of it is copy-pasted from longSlaveDescription.tw */
-
-<<setLocalPronouns $activeChild>>
-
-/* 000-250-006 */
-<<if $seeImages == 1>>
-	<<if $imageChoice == 1>>
-		<div class="imageRef lrgVector"><div class="mask">&nbsp;</div><<= SlaveArt($activeChild, 3, 0)>></div>
-	<<else>>
-		<div class="imageRef lrgRender"><div class="mask">&nbsp;</div><<= SlaveArt($activeChild, 3, 0)>></div>
-	<</if>>
-<</if>>
-/* 000-250-006 */
-
-&nbsp;&nbsp;&nbsp;&nbsp;
-
-<span id="childName">
-	''@@.pink;<<= SlaveFullName($activeChild)>>@@''
-</span>
-
-<<if $activeChild.custom.label>> (@@.yellow;''<<print $activeChild.custom.label>>''@@)<</if>>
-
-is
-
-<<if $activeChild.devotion < -95>>a @@.darkviolet;hate-filled,@@
-<<elseif $activeChild.devotion < -50>>a @@.darkviolet;hateful,@@
-<<elseif $activeChild.devotion < -20>>a @@.mediumorchid;reluctant,@@
-<<elseif $activeChild.devotion <= 20>>a @@.yellow;hesitant,@@
-<<elseif $activeChild.devotion <= 50>>an @@.hotpink;accepting,@@
-<<elseif $activeChild.devotion <= 95>>a @@.deeppink;devoted,@@
-<<else>>a @@.magenta;worshipful,@@
-<</if>>
-<<if $activeChild.trust < -95>>@@.goldenrod;abjectly terrified@@
-<<elseif $activeChild.trust < -50>>@@.goldenrod;terrified@@
-<<elseif $activeChild.trust < -20>>@@.gold;frightened@@
-<<elseif $activeChild.trust < 20>>@@.yellow;fearful@@
-<<elseif $activeChild.trust <= 50>>
-	<<if $activeChild.devotion < -20>>
-		@@.orange;careful@@
-	<<else>>
-		@@.mediumaquamarine;careful@@
-	<</if>>
-<<elseif $activeChild.trust < 95>>
-	<<if $activeChild.devotion < -20>>
-		@@.orangered;bold@@
-	<<else>>
-		@@.mediumseagreen;trusting@@
-	<</if>>
-<<else>>
-	<<if $activeChild.devotion < -20>>
-		@@.darkred;defiant@@
-	<<else>>
-		@@.seagreen;profoundly trusting@@
-	<</if>>
-<</if>>
-
-<<set $desc = "child">>
-''@@.coral;$desc.@@''
-
-
-<<if $activeChild.slaveName != $activeChild.birthName || $activeChild.slaveSurname != $activeChild.birthSurname>>
-	<<set _nameloss = 0>>
-	<<if $activeChild.fuckdoll == 0>>
-		<<if $activeChild.slaveName != $activeChild.birthName && $activeChild.slaveSurname != $activeChild.birthSurname>>
-			<<= SlaveFullName($activeChild)>> is not $his original full name;
-			<<if $activeChild.birthName === "" || $activeChild.birthSurname === "">>
-				whatever it was, however, has been lost forever.
-				<<set _nameloss = 1>>
-			<</if>>
-		<<elseif $activeChild.slaveName != $activeChild.birthName>>
-			$activeChild.slaveName is not $his original given name;
-			<<if $activeChild.birthName === "">>
-				whatever it was, however, has been lost forever.
-				<<set _nameloss = 1>>
-			<</if>>
-		<<elseif $activeChild.slaveSurname != $activeChild.birthSurname>>
-			<<if $activeChild.slaveSurname === 0>>
-				$He once had a surname;
-				<<if $activeChild.birthSurname === "">>
-					whatever it was, however, has been lost forever.
-					<<set _nameloss = 1>>
-				<</if>>
-			<<else>>
-				$activeChild.slaveSurname is not $his original surname;
-				<<if $activeChild.birthSurname === "">>
-					whatever it was, however, has been lost forever.
-					<<set _nameloss = 1>>
-				<</if>>
-			<</if>>
-		<</if>>
-		<<if $activeChild.birthName !== "" || $activeChild.birthSurname !== "">>
-			<<if _nameloss == 1>>
-				$He
-			<<else>>
-				$he
-			<</if>>
-			<<if $activeChild.devotion > 95>>
-				adores $his slave name and affects to have forgotten that $he was ever called
-			<<elseif $activeChild.devotion > 50>>
-				uses $his slave name automatically and gives no sign that $he was ever called
-			<<elseif $activeChild.devotion > 20>>
-				uses $his slave name despite once being known as
-			<<elseif $activeChild.devotion >= -20>>
-				uses $his slave name hesitantly since $he was once called
-			<<elseif $activeChild.devotion >= -50>>
-				uses $his slave name with resentment since $he prefers $his original name,
-			<<else>>
-				uses $his slave name only when constantly punished, since $he feels $his real name is
-			<</if>>
-			<<if $activeChild.birthName === "">>
-				$activeChild.birthSurname.
-			<<elseif $activeChild.birthSurname === "">>
-				$activeChild.birthName.
-			<<else>>
-				<<= SlaveFullBirthName($activeChild)>>.
-			<</if>>
-		<</if>>
-		<<if $activeChild.slaveSurname == 0>>
-			$He has no surname as a slave, which $he
-			<<if $activeChild.devotion > 95>>loves.
-			<<elseif $activeChild.devotion > 50>>likes.
-			<<elseif $activeChild.devotion > 20>>accepts.
-			<<elseif $activeChild.devotion >= -20>>tolerates.
-			<<elseif $activeChild.devotion >= -50>>resents.
-			<<else>>hates.
-			<</if>>
-		<</if>>
-	<<else>>
-		<<= SlaveFullName($activeChild)>> is not $his original name: $he was once called <<= SlaveFullBirthName($activeChild)>>.
-	<</if>>
-<</if>>
-*/
-<<= App.Desc.ageAndHealth($activeChild)>>
-
-<<if $saleDescription != 1>>
-	<<if $clinic != 0 && $clinicUpgradeScanner == 1>>
-		<<if $activeChild.chem > 15>>
-			$clinicNameCaps's scanners score long term carcinogenic buildup in $his body at @@.cyan;<<print Math.ceil($activeChild.chem/10)>>.@@
-		<<else>>
-			$clinicNameCaps's scanners confirm that $he has good prospects for long term health.
-		<</if>>
-	<</if>>
-
-	<<if $showSexualHistory == 1 && $ui != "start">>
-		<<set _weeksOwned = $week-$activeChild.weekAcquired>>
-		$He has been with you
-		<<if $activeChild.weekAcquired == 0>>
-			since before you owned the arcology,
-		<<elseif $activeChild.weekAcquired == 1>>
-			since you first took control of the arcology,
-		<<elseif _weeksOwned > 1>>
-			<<print $week-$activeChild.weekAcquired>> weeks,
-		<<else>>
-			one week,
-		<</if>>
-
-		<<if ($activeChild.counter.oral + $activeChild.counter.vaginal + $activeChild.counter.anal + $activeChild.counter.mammary + $activeChild.counter.penetrative) > 0>>
-			and has been fucked about <<print num($activeChild.counter.oral + $activeChild.counter.vaginal + $activeChild.counter.anal + $activeChild.counter.mammary + $activeChild.counter.penetrative)>> times, including
-			<<if $activeChild.counter.mammary > 0>>
-				<<print num($activeChild.counter.mammary)>> mammary,
-			<</if>>
-			<<if $activeChild.counter.vaginal > 0>>
-				<<print num($activeChild.counter.vaginal)>> vanilla,
-			<</if>>
-			<<if $activeChild.counter.anal > 0>>
-				<<print num($activeChild.counter.anal)>> anal,
-			<</if>>
-			<<if $activeChild.counter.penetrative > 0>>
-				<<print num($activeChild.counter.penetrative)>> penetrating,
-			<</if>>
-			<<if ($activeChild.counter.penetrative+$activeChild.counter.mammary+$activeChild.counter.vaginal+$activeChild.counter.anal) > 0>>
-				and
-			<</if>>
-			<<print num($activeChild.counter.oral)>> oral sexual encounters.
-		<<else>>
-			<<if $week-$activeChild.weekAcquired >= 1>>
-				and
-			<<else>>
-				$He
-			<</if>>
-			has had little or no sexual experience <<if $activeChild.weekAcquired != 0>>as your slave<<else>>in your new arcology<</if>> yet.
-		<</if>>
-
-		<<set _sortedCounts = []>>
-		<<set _sortedCounts.push({type: "anal", value: $activeChild.counter.anal}), _sortedCounts.push({type: "vaginal", value: $activeChild.counter.vaginal}), _sortedCounts.push({type: "oral", value: $activeChild.counter.oral/2}), _sortedCounts.push({type: "mammary", value: $activeChild.counter.mammary}), _sortedCounts.push({type: "penetrative", value: $activeChild.counter.penetrative})>>
-		<<set _sortedCounts = _sortedCounts.sort(function(a, b){return b.value-a.value})>>
-		<<if _weeksOwned > 0>>
-			<<if _sortedCounts[0].type == "anal">>
-				<<if (_weeksOwned*112)/$activeChild.counter.anal < 4>>
-					Remarkably, this means that $he's been buttfucked
-					<<if (_weeksOwned*112)/$activeChild.counter.anal < 1>>
-						more than once every hour
-					<<elseif (_weeksOwned*112)/$activeChild.counter.anal < 1.5>>
-						about once every hour
-					<<elseif (_weeksOwned*112)/$activeChild.counter.anal < 2.5>>
-						about once every two hours
-					<<elseif (_weeksOwned*112)/$activeChild.counter.anal < 3.5>>
-						about once every three hours
-					<<else>>
-						about once every four hours
-					<</if>>
-					$he's spent awake.
-				<</if>>
-			<<elseif _sortedCounts[0].type == "vaginal">>
-				<<if (_weeksOwned*112)/$activeChild.counter.vaginal < 4>>
-					Remarkably, this means that $his pussy has been fucked
-					<<if (_weeksOwned*112)/$activeChild.counter.vaginal < 1>>
-						more than once every hour
-					<<elseif (_weeksOwned*112)/$activeChild.counter.vaginal < 1.5>>
-						about once every hour
-					<<elseif (_weeksOwned*112)/$activeChild.counter.vaginal < 2.5>>
-						about once every two hours
-					<<elseif (_weeksOwned*112)/$activeChild.counter.vaginal < 3.5>>
-						about once every three hours
-					<<else>>
-						about once every four hours
-					<</if>>
-					$he's spent awake.
-				<</if>>
-			<<elseif _sortedCounts[0].type == "oral">>
-				<<if (_weeksOwned*112)/$activeChild.counter.oral < 4>>
-					Remarkably, this means that $he's sucked something off
-					<<if (_weeksOwned*112)/$activeChild.counter.oral < 1>>
-						more than once every hour
-					<<elseif (_weeksOwned*112)/$activeChild.counter.oral < 1.5>>
-						about once every hour
-					<<elseif (_weeksOwned*112)/$activeChild.counter.oral < 2.5>>
-						about once every two hours
-					<<elseif (_weeksOwned*112)/$activeChild.counter.oral < 3.5>>
-						about once every three hours
-					<<else>>
-						about once every four hours
-					<</if>>
-					$he's spent awake.
-				<</if>>
-			<<elseif _sortedCounts[0].type == "mammary">>
-				<<if (_weeksOwned*112)/$activeChild.counter.mammary < 4>>
-					Remarkably, this means that $he's put $his tits to work
-					<<if (_weeksOwned*112)/$activeChild.counter.mammary < 1>>
-						more than once every hour
-					<<elseif (_weeksOwned*112)/$activeChild.counter.mammary < 1.5>>
-						about once every hour
-					<<elseif (_weeksOwned*112)/$activeChild.counter.mammary < 2.5>>
-						about once every two hours
-					<<elseif (_weeksOwned*112)/$activeChild.counter.mammary < 3.5>>
-						about once every three hours
-					<<else>>
-						about once every four hours
-					<</if>>
-					$he's spent awake.
-				<</if>>
-			<<elseif _sortedCounts[0].type == "penetrative">>
-				<<if (_weeksOwned*112)/$activeChild.counter.penetrative < 4>>
-					Remarkably, this means that $he's pounded a hole
-					<<if (_weeksOwned*112)/$activeChild.counter.penetrative < 1>>
-						more than once every hour
-					<<elseif (_weeksOwned*112)/$activeChild.counter.penetrative < 1.5>>
-						about once every hour
-					<<elseif (_weeksOwned*112)/$activeChild.counter.penetrative < 2.5>>
-						about once every two hours
-					<<elseif (_weeksOwned*112)/$activeChild.counter.penetrative < 3.5>>
-						about once every three hours
-					<<else>>
-						about once every four hours
-					<</if>>
-					$he's spent awake.
-				<</if>>
-			<</if>>
-		<</if>>
-	<</if>>
-
-	<<= App.Desc.eyes($activeChild)>>
-
-	<<if $activeChild.fetish == "mindbroken">>
-		However, @@.coral;$his mind is fundamentally broken;@@ everything $he experiences will quickly be forgotten.
-	<</if>>
-
-	<<if ($activeChild.behavioralFlaw == "arrogant")>>
-		<<if ($activeChild.devotion < -20) && ($activeChild.trust >= -20)>>
-			$He is @@.red;arrogant@@ and clings to $his dignity.
-		<<elseif ($activeChild.devotion < -20)>>
-			$He is still @@.red;arrogant@@ at heart, but does $his best to hide it out of fear.
-		<<elseif ($activeChild.devotion <= 20)>>
-			$He is @@.red;arrogant@@ and seems to think slavery beneath $him.
-		<<else>>
-			Despite being well broken, $he seems to retain hints of @@.red;arrogance.@@
-		<</if>>
-	<<elseif ($activeChild.behavioralFlaw == "bitchy")>>
-		<<if ($activeChild.devotion < -20) && ($activeChild.trust >= -20)>>
-			$He is @@.red;bitchy@@ and insults you every chance $he gets.
-		<<elseif ($activeChild.devotion < -20)>>
-			$He is still @@.red;bitchy@@ at times, but does $his best to keep quiet out of fear.
-		<<elseif ($activeChild.devotion <= 20)>>
-			$He is @@.red;bitchy@@ and constantly tries to get a word in edgewise.
-		<<else>>
-			Since $he is well broken, $he tries to confine $his @@.red;bitchy@@ remarks to your other slaves.
-		<</if>>
-	<<elseif ($activeChild.behavioralFlaw == "liberated")>>
-		<<if ($activeChild.devotion < -20) && ($activeChild.trust >= -20)>>
-			$He strongly believes that @@.red;slavery is wrong,@@ and resists it as best $he can.
-		<<elseif ($activeChild.devotion < -20)>>
-			$He strongly believes that @@.red;slavery is wrong,@@ but usually keeps quiet out of fear.
-		<<elseif ($activeChild.devotion <= 20)>>
-			$He strongly believes that @@.red;slavery is wrong,@@ and rarely misses a chance to complain about it.
-		<<else>>
-			$He strongly believes that @@.red;slavery is wrong,@@ but has learned to keep it to $himself.
-		<</if>>
-	<<elseif ($activeChild.behavioralFlaw == "devout")>>
-		$He is @@.red;devoutly religious,@@
-		<<if ($activeChild.devotion < -20) && ($activeChild.trust >= -20)>>
-			and uses $his faith as a wellspring of resistance.
-		<<elseif ($activeChild.devotion < -20)>>
-			and uses $his faith as a place of refuge.
-		<<elseif ($activeChild.devotion <= 20)>>
-			and uses $his faith as a private place within $himself.
-		<<else>>
-			but has learned to keep $his faith private.
-		<</if>>
-	<<elseif ($activeChild.behavioralFlaw == "odd")>>
-		$He behaves @@.red;oddly,@@ saying and doing random things.
-	<<elseif ($activeChild.behavioralFlaw == "hates men")>>
-		$He @@.red;strongly dislikes@@ being around
-		<<if ($activeChild.attrXY >= 85) && ($activeChild.energy >= 40)>>
-			men; since $he loves the dick, $he's forced to put up with them.
-		<<elseif ($activeChild.attrXY >= 65) && ($activeChild.energy >= 40)>>
-			men; since $he likes the dick, $he reluctantly puts up with them.
-		<<else>>
-			men.
-		<</if>>
-	<<elseif ($activeChild.behavioralFlaw == "hates women")>>
-		$He @@.red;strongly dislikes@@ being around
-		<<if ($activeChild.attrXX >= 85) && ($activeChild.energy >= 40)>>
-			women; since $he loves pussy, $he's forced to put up with them.
-		<<elseif ($activeChild.attrXX >= 65) && ($activeChild.energy >= 40)>>
-			women; since $he likes pussy, $he reluctantly puts up with them.
-		<<else>>
-			women.
-		<</if>>
-	<<elseif ($activeChild.behavioralFlaw == "anorexic")>>
-		$He suffers from @@.red;anorexia.@@
-	<<elseif ($activeChild.behavioralFlaw == "gluttonous")>>
-		$He @@.red;tends to overeat@@ whenever $he can, reacting to the rigors of sexual slavery with overeating.
-	<</if>>
-
-	<<switch $activeChild.behavioralQuirk>>
-	<<case "confident">>
-		$He's @@.green;confident,@@ and believes that $he has something of value to offer, even as a slave.
-	<<case "cutting">>
-		$He often has a witty or @@.green;cutting@@ remark ready, but knows when to keep them to $himself.
-	<<case "funny">>
-		$He's @@.green;funny,@@ often providing a little comic relief.
-	<<case "adores women">>
-		$He @@.green;adores women,@@ and loves spending time with them.
-	<<case "adores men">>
-		$He @@.green;adores men,@@ and loves spending time with them.
-	<<case "fitness">>
-		$He's a @@.green;fitness fanatic,@@ and almost gets off to a hard workout.
-	<<case "insecure">>
-		$He's @@.green;insecure,@@ defining $his self worth by how much others want to fuck $him.
-	<<case "sinful">>
-		<<if $arcologies[0].FSChattelReligionist == "unset">>
-			$He's delightfully @@.green;sinful,@@ taking real pleasure in breaking cultural mores.
-		<<else>>
-			$He's a devout Chattel Religionist, and is aggressively @@.green;sinful@@ against old world faiths. $He is enthusiastic about slutty religious clothing, and excited by intentional sacrilege like openly using old world religious icons as sex toys or having orgies on altars.
-		<</if>>
-	<<case "advocate">>
-		$He's an @@.green;advocate@@ for slavery, and can articulate what it's done for $him.
-	<</switch>>
-
-	<<switch $activeChild.sexualFlaw>>
-	<<case "hates oral">>
-		$He @@.red;hates@@ oral sex and tries to avoid it.
-	<<case "hates anal">>
-		$He @@.red;hates@@ anal sex and tries to avoid it.
-	<<case "hates penetration">>
-		$He @@.red;hates@@ penetration and tries to avoid it.
-	<<case "repressed">>
-		$He is @@.red;sexually repressed,@@ retaining a fundamental distaste for sex from $his upbringing.
-	<<case "idealistic">>
-		$He is @@.red;sexually idealistic,@@ retaining a belief that sex should be based on love and consent.
-	<<case "shamefast">>
-		$He is @@.red;shamefast,@@ suffering crippling anxiety when naked.
-	<<case "apathetic">>
-		$He is @@.red;sexually apathetic,@@ often slipping into inertness during sex.
-	<<case "crude">>
-		$He is @@.red;sexually crude,@@ and has little sense of what partners find disgusting during sex.
-	<<case "judgemental">>
-		$He is @@.red;sexually judgemental,@@ and often denigrates $his sexual partners' performance.
-	<<case "cum addict">>
-		$He's a @@.yellow;cum addict:@@ $he has a deep psychological addiction to <<if $PC.dick >= 1>>semen<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>pussyjuice<</if>> and becomes anxious if $he goes for a few hours without drinking any.
-	<<case "anal addict">>
-		$He's an @@.yellow;anal addict:@@ $he has a deep psychological need to be fucked in the ass and becomes anxious if $he goes for a few hours without anal.
-	<<case "attention whore">>
-		$He's an @@.yellow;attention whore:@@ shocking and titillating spectators is more important to $him than the actual pleasure of sex.
-	<<case "breast growth">>
-		$He has a @@.yellow;breast growth obsession:@@ $he's nearly incapable of believing that $his breasts are big enough.
-	<<case "abusive">>
-		$He's sexually @@.yellow;abusive:@@ $he prefers taking sexual pleasure by force to having it offered to $him.
-	<<case "malicious">>
-		$He's sexually @@.yellow;malicious:@@ $he gets off on others' anguish.
-	<<case "self hating">>
-		$He's filled with @@.yellow;self hatred,@@ and is disturbingly willing to comply with things that might hurt $him.
-	<<case "neglectful">>
-		$He's sexually @@.yellow;self neglectful,@@ and often shows no interest in getting off $himself.
-	<<case "breeder">>
-		$He's @@.yellow;obsessed with being bred@@ to the point of fetishizing pregnancy itself as much as any act that leads to it.
-	<</switch>>
-
-	<<switch $activeChild.sexualQuirk>>
-	<<case "gagfuck queen">>
-		$He's a @@.green;gagfuck queen:@@ $he's able to safely take a rough facefuck.
-	<<case "painal queen">>
-		$He's a @@.green;painal queen:@@ $he knows exactly how much $he can take without getting hurt.
-	<<case "strugglefuck queen">>
-		$He's a @@.green;strugglefuck queen:@@ $he can gauge exactly how much resistance $his partners want.
-	<<case "tease">>
-		$He's a @@.green;tease,@@ and often displays a little flash of $himself followed by a blush.
-	<<case "romantic">>
-		$He's a @@.green;romantic,@@ and persists in innocent pleasure in the closeness of sex.
-	<<case "perverted">>
-		$He's @@.green;perverted,@@ and enjoys breaking sexual boundaries.
-	<<case "caring">>
-		$He's @@.green;caring,@@ and enjoys bringing partners pleasure more than getting off $himself.
-	<<case "unflinching">>
-		$He's @@.green;unflinching,@@ willing to do anything, even by the standards of sex slaves.
-	<<case "size queen">>
-		$He's @@.green;a size queen;@@ preferring big cock is almost $his trademark.
-	<</switch>>
-
-	<<if ($activeChild.fetishKnown == 1)>>
-		<<switch $activeChild.fetish>>
-		<<case "submissive">>
-			<<if ($activeChild.sexualFlaw == "apathetic")>>
-				This sexual apathy plays into $his preference for @@.lightcoral;submission.@@
-			<<elseif ($activeChild.behavioralFlaw == "arrogant")>>
-				$His arrogance is really just a thin shell to protect $his true need to @@.lightcoral;submit.@@
-			<<elseif ($activeChild.fetishStrength > 95)>>
-				$He's an extreme @@.lightcoral;submissive,@@ and relishes the strictures of slavery.
-			<<elseif ($activeChild.fetishStrength > 60)>>
-				$He's a confirmed @@.lightcoral;submissive,@@ and enjoys the strictures of slavery.
-			<<else>>
-				$He has @@.lightcoral;submissive@@ tendencies, and likes the strictures of slavery.
-			<</if>>
-		<<case "cumslut">>
-			<<if ($activeChild.sexualFlaw == "hates oral")>>
-				$He's torn between $his @@.lightcoral;love of semen@@ and $his dislike of having cocks in $his mouth.
-			<<elseif ($activeChild.fetishStrength > 95)>>
-				$He's a @@.lightcoral;cumslut,@@ and loves giving blowjobs and receiving facials.
-			<<elseif ($activeChild.fetishStrength > 60)>>
-				$He @@.lightcoral;prefers giving oral,@@ and enjoys sucking dick and receiving facials.
-			<<else>>
-				$He has an @@.lightcoral;oral fixation,@@ and likes giving blowjobs and receiving facials.
-			<</if>>
-		<<case "humiliation">>
-			<<if ($activeChild.behavioralFlaw == "bitchy")>>
-				$His bitchiness is really just an expression of $his deep need to be @@.lightcoral;humiliated@@ $himself.
-			<<elseif ($activeChild.sexualFlaw == "shamefast")>>
-				$His shame is genuine, and it is with real self-loathing that $he @@.lightcoral;gets off on humiliation.@@
-			<<elseif ($activeChild.fetishStrength > 95)>>
-				$He's a slut for @@.lightcoral;humiliation,@@ and gets off on having others see $his enslavement.
-			<<elseif ($activeChild.fetishStrength > 60)>>
-				$He enjoys @@.lightcoral;humiliating@@ sex.
-			<<else>>
-				$He likes @@.lightcoral;embarrassing@@ sex.
-			<</if>>
-		<<case "buttslut">>
-			<<if ($activeChild.sexualFlaw == "hates anal")>>
-				$His hatred is just pretense to cover $his shame about how much $he really loves getting @@.lightcoral;fucked in the butt.@@
-			<<elseif ($activeChild.fetishStrength > 95)>>
-				$He's a @@.lightcoral;buttslut,@@ happy to have anyone put anything up $his ass.
-			<<elseif ($activeChild.fetishStrength > 60)>>
-				$He @@.lightcoral;prefers anal.@@
-			<<else>>
-				$He has an @@.lightcoral;anal fixation.@@
-			<</if>>
-		<<case "boobs">>
-			<<if ($activeChild.fetishStrength > 95)>>
-				$He @@.lightcoral;prefers mammary intercourse@@ to any other kind of sex, and readily climaxes to nipple stimulation.
-			<<elseif ($activeChild.fetishStrength > 60)>>
-				$He enjoys @@.lightcoral;breast play,@@ and is rapidly aroused by nipple stimulation.
-			<<else>>
-				$He @@.lightcoral;really likes boobs,@@ $hers and others.
-			<</if>>
-		<<case "pregnancy">>
-			<<if ($activeChild.fetishStrength > 95)>>
-				$He has a @@.lightcoral;pregnancy fetish,@@ and finds anything related to reproduction sexy.
-			<<elseif ($activeChild.fetishStrength > 60)>>
-				$He has an @@.lightcoral;impregnation fantasy,@@ and enjoys bareback sex.
-			<<else>>
-				$He has a recurring @@.lightcoral;impregnation fantasy.@@
-			<</if>>
-		<<case "dom">>
-			<<if ($activeChild.sexualFlaw == "apathetic")>>
-				$He is at war with $himself, since $his habitual apathy during sex barely masks a desire to @@.lightcoral;dominate.@@
-			<<elseif ($activeChild.fetishStrength > 95)>>
-				$He is a @@.lightcoral;complete dom;@@ with other slaves this is expressed as a strong preference to top, and with $his betters $he's an almost competitive lover.
-			<<elseif ($activeChild.fetishStrength > 60)>>
-				$He likes to take an active, powerful role in sex; with other slaves this is expressed as @@.lightcoral;dominance,@@ and with $his betters $he's a very energetic lover.
-			<<else>>
-				$He prefers to take a @@.lightcoral;dominant@@ sexual role.
-			<</if>>
-		<<case "sadist">>
-			<<if ($activeChild.fetishStrength > 95)>>
-				$He is an @@.lightcoral;aggressive sadist;@@ $he's constantly plotting to control, abuse, and hurt other slaves.
-			<<elseif ($activeChild.fetishStrength > 60)>>
-				$He has @@.lightcoral;sadistic tendencies;@@ $he enjoys watching other slaves in pain, but truly loves causing pain $himself.
-			<<else>>
-				$He gets off on @@.lightcoral;the suffering of others;@@ $he enjoys watching other slaves in pain.
-			<</if>>
-		<<case "masochist">>
-			<<if ($activeChild.fetishStrength > 95)>>
-				$He is a @@.lightcoral;pain slut.@@
-			<<elseif ($activeChild.fetishStrength > 60)>>
-				$He @@.lightcoral;gets off on pain,@@ showing strong masochistic tendencies.
-			<<else>>
-				$He @@.lightcoral;doesn't mind pain,@@ and shows some masochistic tendencies.
-			<</if>>
-		<<default>>
-			$His sexual tastes are @@.pink;quite normal.@@
-		<</switch>>
-	<<else>>
-		$His fetishes, if any, are not known to you.
-	<</if>>
-
-	<<if ($activeChild.attrKnown == 1)>>
-		<<if ($activeChild.energy > 95)>>
-			$He's a @@.green;nymphomaniac.@@
-		<<elseif ($activeChild.energy > 80)>>
-			$He's a @@.green;sex addict.@@
-		<<elseif ($activeChild.energy > 60)>>
-			$He has a @@.green;powerful appetite for sex.@@
-		<<elseif ($activeChild.energy > 40)>>
-			$He has a @@.yellow;healthy sex drive.@@
-		<<elseif ($activeChild.energy > 20)>>
-			$He has a @@.red;weak sex drive.@@
-		<<else>>
-			$He's @@.red;frigid,@@ with little interest in sex.
-		<</if>>
-		<<if ($activeChild.attrXY <= 5)>>
-			<<if ($activeChild.attrXX <= 5)>>
-				$He @@.red;finds both men's and women's intimate areas quite repulsive,@@ an unfortunate state of affairs!
-			<<else>>
-				$He @@.red;finds men sexually disgusting,@@
-				<<if ($activeChild.attrXX <= 15)>>
-					and @@.red;has almost as much trouble with women.@@
-				<<elseif ($activeChild.attrXX <= 35)>>
-					and is @@.red;unenthusiastic about women.@@
-				<<elseif ($activeChild.attrXX <= 65)>>
-					and $he is indifferent to women.
-				<<elseif ($activeChild.attrXX <= 85)>>
-					but @@.green;is attracted to women.@@
-				<<elseif ($activeChild.attrXX <= 95)>>
-					@@.green;strongly preferring women.@@
-				<<else>>
-					but is @@.green;passionate about women.@@
-				<</if>>
-			<</if>>
-		<<elseif ($activeChild.attrXY <= 15)>>
-			$He @@.red;considers men's bodies a turnoff,@@
-			<<if ($activeChild.attrXX <= 5)>>
-				and is @@.red;actually disgusted by women's.@@
-			<<elseif ($activeChild.attrXX <= 15)>>
-				and @@.red;feels the same about women's.@@
-			<<elseif ($activeChild.attrXX <= 35)>>
-				and is @@.red;unenthusiastic about women.@@
-			<<elseif ($activeChild.attrXX <= 65)>>
-				and $he is indifferent to women.
-			<<elseif ($activeChild.attrXX <= 85)>>
-				but @@.green;is attracted to women.@@
-			<<elseif ($activeChild.attrXX <= 95)>>
-				@@.green;strongly preferring women.@@
-			<<else>>
-				but is @@.green;passionate about women.@@
-			<</if>>
-		<<elseif ($activeChild.attrXY <= 35)>>
-			$He @@.red;finds most men unattractive,@@
-			<<if ($activeChild.attrXX <= 5)>>
-				and is @@.red;disgusted by the idea of intimacy with a woman.@@
-			<<elseif ($activeChild.attrXX <= 15)>>
-				and is @@.red;turned off by women.@@
-			<<elseif ($activeChild.attrXX <= 35)>>
-				and is @@.red;unenthusiastic about women.@@
-			<<elseif ($activeChild.attrXX <= 65)>>
-				and $he is indifferent to women.
-			<<elseif ($activeChild.attrXX <= 85)>>
-				but @@.green;is attracted to women.@@
-			<<elseif ($activeChild.attrXX <= 95)>>
-				@@.green;strongly preferring women.@@
-			<<else>>
-				but is @@.green;passionate about women.@@
-			<</if>>
-		<<elseif ($activeChild.attrXY <= 65)>>
-			$He's indifferent to sex with men,
-			<<if ($activeChild.attrXX <= 5)>>
-				but is @@.red;disgusted by the idea of intimacy with a woman.@@
-			<<elseif ($activeChild.attrXX <= 15)>>
-				but is @@.red;turned off by women.@@
-			<<elseif ($activeChild.attrXX <= 35)>>
-				but is @@.red;actually unenthusiastic about women.@@
-			<<elseif ($activeChild.attrXX <= 65)>>
-				and feels the same about women, too.
-			<<elseif ($activeChild.attrXX <= 85)>>
-				but @@.green;is attracted to women.@@
-			<<elseif ($activeChild.attrXX <= 95)>>
-				@@.green;strongly preferring women.@@
-			<<else>>
-				but is @@.green;passionate about women.@@
-			<</if>>
-		<<elseif ($activeChild.attrXY <= 85)>>
-			$He @@.green;finds men attractive,@@
-			<<if ($activeChild.attrXX <= 5)>>
-				but is @@.red;disgusted by the idea of intimacy with a woman.@@
-			<<elseif ($activeChild.attrXX <= 15)>>
-				but is @@.red;turned off by women.@@
-			<<elseif ($activeChild.attrXX <= 35)>>
-				but is @@.red;unenthusiastic about women.@@
-			<<elseif ($activeChild.attrXX <= 65)>>
-				but is indifferent to women.
-			<<elseif ($activeChild.attrXX <= 85)>>
-				and @@.green;likes women too.@@
-			<<elseif ($activeChild.attrXX <= 95)>>
-				but @@.green;likes women even more.@@
-			<<else>>
-				but is really @@.green;passionate about women.@@
-			<</if>>
-		<<elseif ($activeChild.attrXY <= 95)>>
-			$He @@.green;is aroused by most men,@@
-			<<if ($activeChild.attrXX <= 5)>>
-				but is @@.red;disgusted by the idea of intimacy with a woman.@@
-			<<elseif ($activeChild.attrXX <= 15)>>
-				but is @@.red;turned off by women.@@
-			<<elseif ($activeChild.attrXX <= 35)>>
-				but is @@.red;unenthusiastic about women.@@
-			<<elseif ($activeChild.attrXX <= 65)>>
-				but is indifferent to women.
-			<<elseif ($activeChild.attrXX <= 85)>>
-				and @@.green;likes women too.@@
-			<<elseif ($activeChild.attrXX <= 95)>>
-				and @@.green;thinks most women are hot,@@ too.
-			<<else>>
-				but is most @@.green;passionate about women.@@
-			<</if>>
-		<<else>>
-			<<if ($activeChild.attrXX > 95)>>
-				$He's @@.green;omnisexual,@@ and is passionately attracted to nearly everyone.
-			<<else>>
-				$He's @@.green;passionate about men,@@
-				<<if ($activeChild.attrXX <= 5)>>
-					but is @@.red;disgusted by the idea of intimacy with a woman.@@
-				<<elseif ($activeChild.attrXX <= 15)>>
-					but is @@.red;turned off by women.@@
-				<<elseif ($activeChild.attrXX <= 35)>>
-					but is @@.red;unenthusiastic about women.@@
-				<<elseif ($activeChild.attrXX <= 65)>>
-					but is indifferent to women.
-				<<elseif ($activeChild.attrXX <= 85)>>
-					but also @@.green;likes women,@@ too.
-				<<else>>
-					but also @@.green;thinks most women are hot,@@ too.
-				<</if>>
-			<</if>>
-		<</if>>
-	<<else>>
-		You do not understand $his sexuality very well.
-	<</if>>
-<</if>>
-
-<<if $saleDescription == 0>>
-	<<if $eventDescription == 0>>
-		<<if canSee($activeChild)>>
-			<<if ($activeChild.attrKnown == 1)>>
-				<<if ($activeChild.assignment != "work in the dairy") || ($dairyRestraintsSetting > 1)>>
-					<<if ($activeChild.attrXX > 85) && ($PC.boobs >= 1)>>
-						$His attraction to women is obvious: $he can't seem to stop staring at your breasts.
-					<<elseif ($activeChild.attrXY > 85) && ($PC.dick >= 1)>>
-						$His attraction to men is obvious: $he can't seem to stop glancing down at your package.
-					<<elseif ($activeChild.attrXY > 85) && ($PC.boobs == 0)>>
-						$His attraction to men is obvious: $he can't seem to stop checking out your broad chest.
-					<</if>>
-				<</if>>
-			<</if>>
-		<</if>>
-	<</if>>
-<</if>>
-
-<<if $activeChild.fuckdoll == 0>>
-	<<= App.Desc.mods($activeChild, "cheek")>>
-	<<= App.Desc.mods($activeChild, "ear")>>
-	<<= App.Desc.mods($activeChild, "neck")>>
-<</if>>
-
-<<if $familyTesting == 1>>
-
-	<<Family>>
-
-	<<if $activeChild.relationship >= 3 && totalRelatives($activeChild) > 0>>
-		<<set _lover = getSlave($activeChild.relationshipTarget)>>
-		<<if def _lover>>
-			<<setLocalPronouns _lover 2>>
-			<<if $activeChild.mother == _lover.ID>>
-				$He is in an @@.lightgreen;incestuous relationship with $his mother, <<= SlaveFullName(_lover)>>.@@
-			<<elseif $activeChild.father == _lover.ID>>
-				$He is in an @@.lightgreen;incestuous relationship with $his father, <<= SlaveFullName(_lover)>>.@@
-			<<elseif _lover.mother == $activeChild.ID || _lover.father == $activeChild.ID>>
-				$He is in an @@.lightgreen;incestuous relationship with $his _daughter2, <<= SlaveFullName(_lover)>>.@@
-			<<else>>
-				<<switch areSisters($activeChild, _lover)>>
-				<<case 1>>
-					$He is in an @@.lightgreen;incestuous relationship with $his twin, <<= SlaveFullName(_lover)>>.@@
-				<<case 2>>
-					$He is in an @@.lightgreen;incestuous relationship with $his _sister2, <<= SlaveFullName(_lover)>>.@@
-				<<case 3>>
-					$He is in an @@.lightgreen;incestuous relationship with $his half-<<= _sister2>>, <<= SlaveFullName(_lover)>>.@@
-				<</switch>>
-			<</if>>
-		<</if>>
-	<<elseif $activeChild.relationship <= -2>>
-		<<setPlayerPronouns>>
-		<<if ($activeChild.mother == -1 || $activeChild.father == -1)>>
-			<<if ($activeChild.mother == -1 && $activeChild.father == -1)>>
-				$He is in an @@.lightgreen;incestuous relationship with $his sole parent, you.@@
-			<<elseif $activeChild.mother == -1>>
-				$He is in an @@.lightgreen;incestuous relationship with $his mother, you.@@
-			<<elseif $activeChild.father == -1>>
-				$He is in an @@.lightgreen;incestuous relationship with $his father, you.@@
-			<</if>>
-		<<elseif $PC.mother == $activeChild.ID || $PC.father == $activeChild.ID>>
-			$He is in an @@.lightgreen;incestuous relationship with $his _daughterP, you.@@
-		<<elseif areSisters($PC, $activeChild) == 1>>
-			$He is in an @@.lightgreen;incestuous relationship with $his twin _sisterP, you.@@
-		<<elseif areSisters($PC, $activeChild) == 2>>
-			$He is in an @@.lightgreen;incestuous relationship with $his _sisterP, you.@@
-		<<elseif areSisters($PC, $activeChild) == 3>>
-			$He is in an @@.lightgreen;incestuous relationship with $his half-<<= _sisterP>>, you.@@
-		<</if>>
-	<</if>>
-
-<<else>>
-
-	<<if $activeChild.relation != 0>>
-		<<set _lcd = $slaveIndices[$activeChild.relationTarget]>>
-		<<if def _lcd>>
-			<<if ($slaves[_lcd].ID == $activeChild.relationshipTarget) && ($activeChild.relationship >= 3)>>
-				$He is @@.lightgreen;<<= SlaveFullName($slaves[_lcd])>>'s $activeChild.relation, making their relationship incestuous.@@
-			<<else>>
-				$He is @@.lightgreen;<<= SlaveFullName($slaves[_lcd])>>'s $activeChild.relation.@@
-			<</if>>
-		<</if>>
-	<</if>>
-
-<</if>> /* closes extended family mode */
-
-<<if $activeChild.rivalry != 0>>
-	<<set _lcd = $slaveIndices[$activeChild.rivalryTarget]>>
-	<<if def _lcd>>
-		$He
-		<<if $activeChild.rivalry <= 1>>
-			@@.lightsalmon;dislikes@@ <<= SlaveFullName($slaves[_lcd])>>.
-		<<elseif $activeChild.rivalry <= 2>>
-			is <<= SlaveFullName($slaves[_lcd])>>'s @@.lightsalmon;rival.@@
-		<<else>>
-			@@.lightsalmon;bitterly hates@@ <<= SlaveFullName($slaves[_lcd])>>.
-		<</if>>
-	<</if>>
-<</if>>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;
-
-<<if $saleDescription == 0>>
-	<<if $activeChild.origin != 0>>
-		$activeChild.origin
-	<</if>>
-<</if>>
-
-/* TODO: will children be able to become prestigious? */
-<<if $activeChild.prestige > 0>>
-	<<if $activeChild.prestigeDesc>>$activeChild.prestigeDesc<</if>>
-	<<if $activeChild.prestige > 2>>
-		It is extremely prestigious to own $him.
-	<<elseif $activeChild.prestige > 1>>
-		It is quite prestigious to own $him.
-	<<else>>
-		It is fairly prestigious to own $him.
-	<</if>>
-<</if>>
-
-<<if $activeChild.pornPrestige > 0>>
-	<<if $activeChild.pornPrestigeDesc>>$activeChild.pornPrestigeDesc<</if>>
-	<<if $activeChild.pornPrestige > 2>>
-		As such, $he tends to gain a following wherever $he goes.
-	<<elseif $activeChild.pornPrestige > 1>>
-		As such, $he is recognized often.
-	<<else>>
-		As such, $he is recognized occasionally.
-	<</if>>
-<</if>>
-
-<<if $activeChild.prestige > 0 || $activeChild.pornPrestige > 1>>
-	<<if $activeChild.fuckdoll == 0 && $activeChild.markings == "birthmark">>
-		$He has a large, liver-colored birthmark, but since $he's well known, this uniqueness adds to $his beauty rather than detracting from it.
-	<</if>>
-<</if>>
-
-<<if $activeChild.fuckdoll > 0>>
-	$He is
-	<<if $activeChild.fuckdoll <= 10>>
-		poorly adapted to life as a living sex toy.
-	<<elseif $activeChild.fuckdoll <= 30>>
-		@@.aquamarine;moderately adapted to life as a living sex toy.@@
-	<<elseif $activeChild.fuckdoll <= 60>>
-		@@.aquamarine;well adapted to life as a living sex toy.@@
-	<<elseif $activeChild.fuckdoll < 100>>
-		@@.aquamarine;almost perfectly adapted to life as a living sex toy.@@
-	<<else>>
-		@@.aquamarine;perfectly adapted to life as a living sex toy.@@
-	<</if>>
-	Entertainment and prostitution skills are irrelevant for a Fuckdoll.
-<<else>>
-	<<if $activeChild.skill.whoring <= 10>>
-		<<if $activeChild.skill.entertainment <= 10>>
-		<<elseif $activeChild.skill.entertainment <= 30>>
-			$He is @@.aquamarine;reasonably entertaining.@@
-		<<elseif $activeChild.skill.entertainment <= 60>>
-			$He is a @@.aquamarine;skilled entertainer.@@
-		<<elseif $activeChild.skill.entertainment < 100>>
-			$He is an @@.aquamarine;expert entertainer.@@
-		<<else>>
-			$He is a @@.aquamarine;master of entertainment.@@
-		<</if>>
-	<<else>>
-		<<if $activeChild.skill.entertainment <= 10>>
-		<<elseif $activeChild.skill.entertainment <= 30>>
-			$He is @@.aquamarine;reasonably entertaining@@ and
-		<<elseif $activeChild.skill.entertainment <= 60>>
-			$He is a @@.aquamarine;skilled entertainer@@ and
-		<<elseif $activeChild.skill.entertainment < 100>>
-			$He is an @@.aquamarine;expert entertainer@@ and
-		<<else>>
-			$He is a @@.aquamarine;master of entertainment@@ and
-		<</if>>
-	<</if>>
-	<<if $activeChild.skill.whoring <= 10>>
-	<<elseif $activeChild.skill.whoring <= 30>>
-		<<if $activeChild.skill.entertainment <= 10>>$He <</if>>has @@.aquamarine;basic experience as a prostitute.@@
-	<<elseif $activeChild.skill.whoring <= 60>>
-		<<if $activeChild.skill.entertainment <= 10>>$He is <</if>>a @@.aquamarine;skilled streetwalker.@@
-	<<elseif $activeChild.skill.whoring < 100>>
-		<<if $activeChild.skill.entertainment <= 10>>$He is <</if>>an @@.aquamarine;expert working $girl.@@
-	<<else>>
-		<<if $activeChild.skill.entertainment <= 10>>$He is <</if>>a @@.aquamarine;masterful whore.@@
-	<</if>>
-<</if>>
-
-<<if ($activeChild.custom.desc != "") && (def $activeChild.custom.desc)>>
-	<<print $activeChild.custom.desc>>
-<</if>>
-
-<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty > 0>>
-	<<if $genderLawPass == 1>>
-		$His body is a perfect example of the fashionable feminine ideal.
-	<</if>>
-<<elseif $arcologies[0].FSSlimnessEnthusiastLaw == 1>>
-	<<if slimLawPass($activeChild) == 1>>
-		$His body is a perfect example of the fashionable ideal flat body.
-	<</if>>
-<<elseif $arcologies[0].FSHedonisticDecadenceLaw2 == 1>>
-	<<if ($activeChild.boobs >= 2000) && ($activeChild.butt >= 5) && ($activeChild.weight > 95)>>
-		$His body is a perfect example of the fashionable plump body.
-	<</if>>
-<</if>>
-
-<<if $arcologies[0].FSRestartSMR > 0 && $arcologies[0].FSRestart > 80 && ($activeChild.dick == 0) && ($activeChild.balls == 0) && ($activeChild.ovaries == 0) && ($activeChild.mpreg == 0) && ($activeChild.vagina < 0)>>
-	$His body is a perfect example of a subhuman who has accepted their place in society.
-<</if>>
-
-<<if ($showScores != 0)>>
-	<<set FResult($activeChild)>>
-	Currently, $he has an @@.pink;''attractiveness score'' of __''$beauty''__@@ and a @@.lightcoral;''sexual score'' of __''$FResult''__.@@
-<</if>>
-
-<br>&nbsp;&nbsp;&nbsp;&nbsp;
-
-<<= App.Desc.limbs($activeChild)>>
-
-<<ClothingDescription>>
-<<if $showBodyMods == 1>>
-	<<clothingCorsetDescription>>
-<</if>>
-
-<<if ($showClothing == 1) && ($saleDescription == 0)>>
-	$He
-<<else>>
-	$activeChild.slaveName
-<</if>>
-<<set _averageHeight = Height.mean($activeChild)>>
-is
-<<if $activeChild.height <= (_averageHeight+5) && $activeChild.height >= (_averageHeight-5)>>
-	an average height<<if $activeChild.physicalAge < 16>> for $his age<</if>>
-<<elseif $activeChild.height < (_averageHeight-15)>>
-	petite<<if $activeChild.physicalAge < 16>> for $his age<</if>>
-<<elseif $activeChild.height < (_averageHeight-5)>>
-	short<<if $activeChild.physicalAge < 16>> for $his age<</if>>
-<<elseif $activeChild.height > (_averageHeight+15)>>
-	very tall<<if $activeChild.physicalAge < 16>> for $his age<</if>>
-<<elseif $activeChild.height > (_averageHeight+5)>>
-	tall<<if $activeChild.physicalAge < 16>> for $his age<</if>>
-<</if>>
-<<if $showHeightCMs == 1>> at <<= heightToEitherUnit($activeChild.height)>>,<</if>>
-
-and
-
-<<if $activeChild.weight > 190 >>
-	<<if $arcologies[0].FSHedonisticDecadence != "unset">>
-		<<print either("perfectly curvy", "perfectly plush")>>.
-	<<else>>
-		@@.red;<<print either("dangerously fat", "dangerously overweight", "extremely obese")>>.@@
-	<</if>>
-<<elseif $activeChild.weight > 160 >>
-	<<if $arcologies[0].FSHedonisticDecadence != "unset">>
-		<<print either("spectacularly curvy", "spectacularly plush")>>.
-	<<else>>
-		@@.red;<<print either("extremely fat", "extremely overweight", "very obese")>>.@@
-	<</if>>
-<<elseif $activeChild.weight > 130 >>
-	<<if $arcologies[0].FSHedonisticDecadence != "unset">>
-		<<print either("amazingly curvy", "amazingly plush")>>.
-	<<else>>
-		@@.red;<<print either("very overweight", "obese", "very fat")>>.@@
-	<</if>>
-<<elseif $activeChild.weight > 95>>
-	<<if $activeChild.hips > 1>>
-		<<print either("extremely curvy", "extremely plush")>>, but $his huge hips make the extra weight attractive on $him.
-	<<elseif $arcologies[0].FSHedonisticDecadence != "unset">>
-		<<print either("extremely curvy", "extremely plush")>>.
-	<<else>>
-		@@.red;<<print either("carrying a lot of extra weight", "fat", "overweight")>>.@@
-	<</if>>
-<<elseif $activeChild.weight > 30>>
-	<<if $activeChild.hips > 1>>
-		<<print either("quite curvy", "very plush")>>, but $his motherly hips make the extra weight attractive on $him.
-	<<elseif $arcologies[0].FSHedonisticDecadence != "unset">>
-		<<print either("quite curvy", "very plush")>>.
-	<<else>>
-		@@.red;<<print either("carrying extra weight", "chubby")>>.@@
-	<</if>>
-<<elseif $activeChild.weight > 10 >><<print either("nicely plush", "pleasingly curvy")>>.
-<<elseif $activeChild.weight >= -10>><<print either("a healthy weight", "an attractive weight for $his frame", "neither too fat nor too skinny")>>.
-<<elseif $activeChild.weight >= -30>><<print either("appealingly skinny", "pleasingly thin")>>.
-<<elseif $activeChild.weight >= -95>>
-	<<if $activeChild.hips > 1>>
-		<<print either("quite skinny", "very thin")>>, but $his wide hips make the gap between $his thighs very noticeable.
-	<<elseif $activeChild.hips < -1>>
-		<<print either("quite skinny", "very thin")>>, but $his trim hips make $him look like a model.
-	<<else>>
-		@@.red;<<print either("rail thin", "too skinny", "underweight")>>.@@
-	<</if>>
-<<else>>@@.red;<<print either("dangerously skinny", "emaciated")>>.@@
-<</if>>
-
-<<if $activeChild.hips > 2>>
-	$His hips are unrealistically wide; it is obvious they have been artificially widened.
-<</if>>
-
-<<waistDescription>>
-
-<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty > 0>>
-	<<if $arcologies[0].FSHedonisticDecadence == "unset" && $arcologies[0].FSPhysicalIdealistStrongFat == 0>>
-		<<if $activeChild.weight > 130>>
-			$He is much too fat for the fashionable feminine ideal.
-		<<elseif $activeChild.weight > 30>>
-			$He is too fat for the fashionable feminine ideal.
-		<<elseif $activeChild.weight < -30>>
-			$He is too skinny for the fashionable feminine ideal.
-		<</if>>
-	<<else>>
-		<<if $activeChild.weight > 130>>
-			$He is much too fat for the fashionable feminine ideal.
-		<<elseif $activeChild.weight < -30>>
-			$He is too skinny for the fashionable feminine ideal.
-		<</if>>
-	<</if>>
-<<elseif $arcologies[0].FSSlimnessEnthusiastLaw == 1>>
-	<<if $arcologies[0].FSHedonisticDecadence == "unset" && $arcologies[0].FSPhysicalIdealistStrongFat == 0>>
-		<<if $activeChild.weight > 30>>
-			$He is much too fat for the fashionable feminine ideal.
-		<<elseif $activeChild.weight > 10>>
-			$He is too fat for the fashionable feminine ideal.
-		<</if>>
-	<<else>>
-		<<if $activeChild.weight > 60>>
-			$He is much too fat for the fashionable feminine ideal.
-		<<elseif $activeChild.weight > 30>>
-			$He is too fat for the fashionable feminine ideal.
-		<</if>>
-	<</if>>
-<<elseif $arcologies[0].FSHedonisticDecadenceLaw2 == 1>>
-	<<if $activeChild.weight <= 95>>
-		$He is too thin for the fashionable feminine ideal.
-	<<elseif $activeChild.weight <= 10>>
-		$He is much too thin for the fashionable feminine ideal.
-	<</if>>
-<</if>>
-
-<<if canWalk($activeChild)>>
-	<<if $activeChild.weight > (170+($activeChild.muscles/5)) && $activeChild.physicalAge >= 18>>
-		$He is so fat that it is difficult for $him to move.
-		<<if $activeChild.muscles > 95>>
-			However, $he is so powerfully built that $he can manage it with effort, though $he often has to stop for breaks.
-		<<elseif $activeChild.muscles > 30>>
-			$He can barely manage to get to $his feet unaided, and usually walks alongside objects to help relieve the weight.
-		<<elseif $activeChild.muscles > 5>>
-			$He requires assistance to get to $his feet, and tends to lean on things to help relieve the weight. Much furniture has met an early demise thanks to this habit.
-		<<else>>
-			$He cannot get to $his feet unaided, and tries to stay seated as much as $he can.
-		<</if>>
-	<<elseif $activeChild.weight > (110+($activeChild.muscles/20)) && $activeChild.physicalAge <= 3>>
-		$He is so fat that it is difficult for $him to move.
-		<<if $activeChild.muscles > 95>>
-			However, $he is so powerfully built that $he can manage it with effort, though $he often has to stop for breaks.
-		<<elseif $activeChild.muscles > 30>>
-			$He can barely manage to get to $his feet unaided, and usually walks alongside objects to help relieve the weight.
-		<<elseif $activeChild.muscles > 5>>
-			$He requires assistance to get to $his feet, and tends to lean on things to help relieve the weight. Much furniture has met an early demise thanks to this habit.
-		<<else>>
-			$He cannot get to $his feet unaided, and tries to stay seated as much as $he can.
-		<</if>>
-	<<elseif $activeChild.weight > (140+($activeChild.muscles/15)) && $activeChild.physicalAge <= 12>>
-		$He is so fat that it is difficult for $him to move.
-		<<if $activeChild.muscles > 95>>
-			However, $he is so powerfully built that $he can manage it with effort, though $he often has to stop for breaks.
-		<<elseif $activeChild.muscles > 30>>
-			$He can barely manage to get to $his feet unaided, and usually walks alongside objects to help relieve the weight.
-		<<elseif $activeChild.muscles > 5>>
-			$He requires assistance to get to $his feet, and tends to lean on things to help relieve the weight. Much furniture has met an early demise thanks to this habit.
-		<<else>>
-			$He cannot get to $his feet unaided, and tries to stay seated as much as $he can.
-		<</if>>
-	<<elseif $activeChild.weight > (165+($activeChild.muscles/10)) && $activeChild.physicalAge < 18>>
-		$He is so fat that it is difficult for $him to move.
-		<<if $activeChild.muscles > 95>>
-			However, $he is so powerfully built that $he can manage it with effort, though $he often has to stop for breaks.
-		<<elseif $activeChild.muscles > 30>>
-			$He can barely manage to get to $his feet unaided, and usually walks alongside objects to help relieve the weight.
-		<<elseif $activeChild.muscles > 5>>
-			$He requires assistance to get to $his feet, and tends to lean on things to help relieve the weight. Much furniture has met an early demise thanks to this habit.
-		<<else>>
-			$He cannot get to $his feet unaided, and tries to stay seated as much as $he can.
-		<</if>>
-	<</if>>
-<</if>>
-
-<<heightImplantDescription>>
-
-$He is
-<<if $activeChild.muscles > 95>>
-	@@.pink;extremely muscular,@@ with defined pecs, powerful glutes, and massive traps<<if $activeChild.weight > 95>> hidden beneath a layer of fat<</if>>.
-<<elseif $activeChild.muscles > 50>>
-	@@.pink;quite muscular,@@ with ripped abs, strong shoulders, and defined lats<<if $activeChild.weight > 95>> hidden beneath a layer of fat<</if>>.
-<<elseif $activeChild.muscles > 30>>
-	@@.pink;well built,@@ yet feminine with defined abs and strong shapely muscles<<if $activeChild.weight > 95>> hidden beneath a layer of fat<</if>>.
-<<elseif $activeChild.muscles > 5>>
-	@@.pink;well built,@@ yet feminine, with just-visible muscles<<if $activeChild.weight > 30>> hidden beneath a layer of fat<</if>>.
-<<elseif $activeChild.muscles > -6>>
-	@@.pink;soft and feminine,@@ with no visible muscles.
-<<elseif $activeChild.muscles > -31>>
-	@@.pink;rather weak,@@ with barely any muscles.
-<<elseif $activeChild.muscles > -96>>
-	@@.pink;very weak;@@ $he struggles with day-to-day tasks.
-<<else>>
-	@@.red;frail;@@ $he can barely hold $himself up.
-<</if>>
-
-<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty + $arcologies[0].FSSlimnessEnthusiastLaw > 0 && $arcologies[0].FSPhysicalIdealist == "unset" && $arcologies[0].FSHedonisticDecadenceStrongFat == 0>>
-	<<if $arcologies[0].FSPhysicalIdealistLaw > 0 && $activeChild.muscles > 50>>
-		$He is entirely too muscular for the fashionable feminine ideal.
-	<<elseif $activeChild.muscles > 30>>
-		$He is entirely too muscular for the fashionable feminine ideal.
-	<</if>>
-<</if>>
-
-<<if hasAnyNaturalArms($activeChild)>>
-	<<if $activeChild.weight > 190>>
-		$He has <<if !hasBothArms($activeChild)>>a <</if>>hugely thick arm<<if hasBothArms($activeChild)>>s<</if>> with sagging fat rolls and
-	<<elseif $activeChild.weight > 160>>
-		$He has <<if !hasBothArms($activeChild)>>a <</if>>thick arm<<if hasBothArms($activeChild)>>s<</if>> with drooping fat folds and
-	<<elseif $activeChild.weight > 130>>
-		$He has <<if !hasBothArms($activeChild)>>a <</if>>plump arm<<if hasBothArms($activeChild)>>s<</if>> with
-	<<elseif $activeChild.weight > 97>>
-		$He has <<if !hasBothArms($activeChild)>>a <</if>>chubby arm<<if hasBothArms($activeChild)>>s<</if>> with
-	<<else>>
-		$He has <<if !hasBothArms($activeChild)>>a <</if>>normal arm<<if hasBothArms($activeChild)>>s<</if>> with
-	<</if>>
-	<<if $activeChild.muscles > 95>>
-		huge muscles<<if $activeChild.weight > 95>> hidden beneath $his soft flesh<</if>>.
-	<<elseif $activeChild.muscles > 30>>
-		obvious muscles<<if $activeChild.weight > 95>> hidden beneath $his soft flesh<</if>>.
-	<<elseif $activeChild.muscles > 5>>
-		toned muscles<<if $activeChild.weight > 30>> hidden beneath $his soft flesh<</if>>.
-	<<else>>
-		little muscle to them.
-	<</if>>
-<</if>>
-
-<<if $activeChild.fuckdoll == 0>>
-	<<if $activeChild.ID == $Bodyguard.ID>>
-		$He is your bodyguard.
-		<<BodyguardWeapon>>
-	<</if>>
-
-	<<if $activeChild.skill.combat > 0>>
-		$He is @@.aquamarine;skilled at combat:@@ $he is comfortable with the use of modern firearms and edged weapons, and $his hands <<if !hasBothArms($activeChild)>>would be deadly weapons if $he had <<if !hasAnyArms($activeChild)>>any<<else>>more than one<</if>><<else>><<if getArmCount($activeChild, 5) + getArmCount($activeChild, 6) > 1>>would be deadly weapons even if they weren't full of deadly weapons already<<else>>are deadly weapons<</if>>.
-	<</if>>
-<</if>>
-
-<<if $activeChild.counter.pitKills > 0>>
-	$activeChild.counter.pitKills slaves have died by $his hand in pit fights.
-<</if>>
-
-<<= App.Desc.piercing($activeChild, "corset")>>
-
-<<pregnancyDescription>>
-
-<<if hasAnyNaturalLegs($activeChild)>>
-	<<if $activeChild.weight > 190>>
-		$He has <<if !hasBothLegs($activeChild)>>an <</if>>extremely fat leg<<if hasBothLegs($activeChild)>>s<</if>> with <<if !hasBothLegs($activeChild)>>an <</if>>immense soft, rather uneven thigh<<if hasBothLegs($activeChild)>>s<</if>> and
-	<<elseif $activeChild.weight > 160>>
-		$He has <<if !hasBothLegs($activeChild)>>a <</if>>very fat leg<<if hasBothLegs($activeChild)>>s<</if>> with <<if !hasBothLegs($activeChild)>>a <</if>>massively thick, soft, somewhat uneven thigh<<if hasBothLegs($activeChild)>>s<</if>> and
-	<<elseif $activeChild.weight > 130>>
-		$He has <<if !hasBothLegs($activeChild)>>a <</if>>fat leg<<if hasBothLegs($activeChild)>>s<</if>> with <<if !hasBothLegs($activeChild)>>a <</if>>hugely thick, soft thigh<<if hasBothLegs($activeChild)>>s<</if>> and
-	<<elseif $activeChild.weight > 97>>
-		$He has <<if !hasBothLegs($activeChild)>>a <</if>>fat leg<<if hasBothLegs($activeChild)>>s<</if>> with <<if !hasBothLegs($activeChild)>>a <</if>>thick, soft thigh<<if hasBothLegs($activeChild)>>s<</if>> and
-	<<elseif $activeChild.weight > 95>>
-		$He has <<if !hasBothLegs($activeChild)>>a <</if>>normal leg<<if hasBothLegs($activeChild)>>s<</if>> with <<if !hasBothLegs($activeChild)>>a <</if>>thick, soft thigh<<if hasBothLegs($activeChild)>>s<</if>> and
-	<<else>>
-		$He has <<if !hasBothLegs($activeChild)>>a <</if>>relatively normal leg<<if hasBothLegs($activeChild)>>s<</if>> and thigh<<if hasBothLegs($activeChild)>>s<</if>> with
-	<</if>>
-	<<if $activeChild.muscles > 95>>
-		huge muscles<<if $activeChild.weight > 95>> hidden beneath $his soft flab<</if>>.
-	<<elseif $activeChild.muscles > 30>>
-		obvious muscles<<if $activeChild.weight > 95>> hidden beneath $his soft flab<</if>>.
-	<<elseif $activeChild.muscles > 5>>
-		toned muscles<<if $activeChild.weight > 30>> hidden beneath $his soft flab<</if>>.
-	<<else>>
-		barely any muscle in them.
-	<</if>>
-<</if>>
-
-<<heelDescription>>
-
-<<if $activeChild.fuckdoll == 0>>
-	/* Check it's not a facial brand. (posting much later, I have basically just printed the list that was here. It might need to be longer, but it's the only way I can think of to hide cheeks and ears in multiBrand.)*/
-	/* Sorted top to bottom */
-	/* Torso */
-	<<= App.Desc.mods($activeChild, "chest")>>
-	<<= App.Desc.mods($activeChild, "back")>>
-	<<= App.Desc.mods($activeChild, "lower back")>>
-
-	/* Arms */
-	<<= App.Desc.mods($activeChild, "upper arm")>>
-	<<= App.Desc.mods($activeChild, "lower arm")>>
-	<<= App.Desc.mods($activeChild, "wrist")>>
-	<<= App.Desc.mods($activeChild, "hand")>>
-
-	/* Legs */
-	/*buttock and thigh are displayed in descriptionWidgetsTattoos, if you can believe it */
-	<<= App.Desc.mods($activeChild), "calf")>>
-	<<= App.Desc.mods($activeChild), "ankle")>>
-	<<= App.Desc.mods($activeChild), "foot")>>
-<</if>>
-
-/* Opposite way of handling above, if that ever proves more convenient. This will print everything that's not on the face. The risk is that it may print things that are already printed elsewhere. */
-/*<<if $activeChild.fuckdoll == 0>>*/
-	/* Describe any brands that aren't on the face */
-	/*<<for _brandName, _brand range $activeChild.brand>>
-	<<if (!["left ear", "left cheek", "right ear", "right cheek"].includes(_brandName))>>
-		$His _brandName is marked with _brand.
-	<</for>>
-<</if>>
-*/
-<<skinDescription>>
-
-<<if $saleDescription == 1>>
-
-	<<accentDescription>>
-
-<</if>>
-<<if $activeChild.fuckdoll == 0>>
-	<<if $activeChild.markings == "birthmark" && $activeChild.prestige == 0 && $activeChild.pornPrestige < 2>>
-		$He has a large, liver-colored birthmark, detracting from $his beauty.
-	<</if>>
-	<<if ($activeChild.skin == "sun tanned")>>
-		<<if ($activeChild.releaseRules != "restrictive" && $activeChild.releaseRules != "masturbation" && $activeChild.releaseRules != "chastity")>>
-			<<if ($activeChild.fetishStrength > 60) && ($activeChild.fetishKnown == 1)>>
-				$His tan is slightly uneven, since $he enjoys
-				<<if ($activeChild.fetish == "buttslut")>>
-					letting other tanned slaves share a tanning bed with $him so they can sodomize $him while $he tans.
-				<<elseif ($activeChild.fetish == "cumslut")>>
-					letting other tanned slaves share a tanning bed with $him so they get oral from $him while $he tans.
-				<<elseif ($activeChild.fetish == "sadist")>>
-					forcing inferior slaves into the tanning beds with $him so $he can sodomize them while $he tans.
-				<<elseif ($activeChild.fetish == "dom")>>
-					bringing other slaves into the tanning beds with $him so $he can fuck them while $he tans.
-				<<elseif ($activeChild.fetish == "masochist") || ($activeChild.fetish == "submissive")>>
-					letting other slaves into the tanning beds with $him so they can fuck $him while $he tans.
-				<<elseif ($activeChild.fetish == "boobs")>>
-					bringing other slaves into the tanning beds with $him so $he can tittyfuck them while $he tans.
-				<<elseif ($activeChild.fetish == "pregnancy") && (random(0,99) < $seeDicks)>>
-					letting slaves with dicks into the tanning beds with $him so they can cum inside $him while $he tans.
-				<<else>>
-					bringing other slaves into the tanning beds with $him to have sex while $he tans.
-				<</if>>
-			<</if>>
-		<</if>>
-	<</if>>
-<</if>>
-
-<<if ($showClothing == 1) && ($saleDescription == 0)>>
-
-	<<earDescription>>
-
-	<<upperFaceDescription>>
-
-	<<HairDescription>>
-
-<<else>>
-	$His hair is $activeChild.hColor<<if $activeChild.hColor != $activeChild.eyebrowHColor>>, with $activeChild.eyebrowHColor eyebrows<</if>>.
-<</if>>
-
-<<if $activeChild.fuckdoll == 0>>
-	<<if ($activeChild.hColor == "red")>>
-		<<if ($activeChild.hLength >= 10)>>
-			<<if ($activeChild.markings == "freckles") || ($activeChild.markings == "heavily freckled")>>
-				<<if (skinToneLevel($activeChild.skin) > 5) && (skinToneLevel($activeChild.skin) < 10)>>
-					It goes perfectly with $his $activeChild.skin skin and freckles.
-				<</if>>
-			<</if>>
-		<</if>>
-	<</if>>
-
-	<<set _pubertyAge = Math.max($activeChild.pubertyAgeXX, $activeChild.pubertyAgeXY)>>
-	<<if ($activeChild.physicalAge < _pubertyAge-2)>>
-		$He is too sexually immature to have armpit hair.
-	<<elseif $activeChild.underArmHStyle == "hairless">>
-		$His armpits are perfectly smooth and naturally hairless.
-	<<elseif $activeChild.underArmHStyle == "bald">>
-		$His armpits no longer grow hair, leaving them smooth and hairless.
-	<<elseif ($activeChild.underArmHStyle == "waxed")>>
-		<<if ($activeChild.assignment == "work in the dairy") && ($dairyRestraintsSetting > 1)>>
-			$His armpit hair has been removed to prevent chafing.
-		<<else>>
-			$His armpits are waxed and smooth.
-		<</if>>
-	<<elseif ($activeChild.physicalAge < _pubertyAge-1)>>
-		$He has a few $activeChild.underArmHColor wisps of armpit hair.
-	<<elseif ($activeChild.physicalAge < _pubertyAge)>>
-		$He is on the verge of puberty and has a small patch of $activeChild.underArmHColor armpit hair.
-	<<elseif $activeChild.underArmHStyle == "shaved">>
-		$His armpits appear hairless, but closer inspection reveals light, $activeChild.underArmHColor stubble.
-	<<elseif $activeChild.underArmHStyle == "neat">>
-		$His armpit hair is neatly trimmed <<if !hasBothArms($activeChild)>>since <<if hasAnyArms($activeChild)>>at least half<<else>>it<</if>> is always in full view<<else>>to not be visible unless $he lifts $his arms<</if>>.
-	<<elseif $activeChild.underArmHStyle == "bushy">>
-		$His $activeChild.underArmHColor armpit hair has been allowed to grow freely, <<if !hasAnyArms($activeChild)>>creating two bushy patches under where $his arms used to be<<else>>so it can be seen poking out from under $his arm<<if hasBothArms($activeChild)>>s<</if>> at all times<</if>>.
-	<</if>>
-<</if>>
-
-<<if $activeChild.voice == 0>>
-	$He is @@.pink;completely silent,@@ which is understandable, since $he's mute.
-<<else>>
-	<<if $activeChild.lips > 95>>
-		$He is @@.pink;effectively mute,@@ since $his lips are so large that $he can no longer speak intelligibly. $He can still <<if $activeChild.devotion > 50>>moan<<elseif $activeChild.devotion > 20>>whimper<<else>>scream<</if>> through them, though.
-	<</if>>
-<</if>>
-
-<<if $showBodyMods == 1>>
-	<<if $activeChild.fuckdoll > 0>>
-		<<if $activeChild.earPiercing+$activeChild.eyebrowPiercing+$activeChild.nosePiercing > 0>>
-			The piercings on $his head run through $his suit, helping secure the material to $his head.
-		<</if>>
-	<<else>>
-		<<= App.Desc.mods($activeChild, "ear")>>
-		<<= App.Desc.mods($activeChild, "nose")>>
-		<<= App.Desc.mods($activeChild, "eyebrow")>>
-		<<if ($activeChild.custom.tattoo != "") && (def $activeChild.custom.tattoo)>>
-			<<print $activeChild.custom.tattoo>>
-		<</if>>
-	<</if>>
-<</if>>
-
-<<faceDescription>>
-<<mouthDescription>>
-
-<<if ($showClothing == 1) && ($saleDescription == 0)>>
-
-	<<if $activeChild.fuckdoll == 0>>
-		<<collarDescription>>
-		<<if ($activeChild.relationship > 4)>>
-			<<if (hasAnyArms($activeChild))>>
-				$He has a simple gold band on the little finger of $his <<if !hasLeftArm($activeChild)>>right<<else>>left<</if>> hand.
-			<<else>>
-				$He has a simple gold band on a length of chain around $his neck.
-			<</if>>
-		<<elseif ($activeChild.relationship == -3)>>
-			<<if (hasAnyArms($activeChild))>>
-				$He has a simple steel band on the little finger of $his <<if !hasLeftArm($activeChild)>>right<<else>>left<</if>> hand.
-			<<else>>
-				$He has a simple steel band on a length of cord around $his neck.
-			<</if>>
-		<</if>>
-	<</if>>
-
-<</if>>
-
-<<if $activeChild.fuckdoll == 0>>
-	<<nailsDescription>>
-<</if>>
-<<= App.Desc.mods($activeChild, "back")>>
-<<= App.Desc.mods($activeChild, "shoulder")>>
-<<= App.Desc.mods($activeChild, "upper arm")>>
-<<= App.Desc.mods($activeChild, "lower arm")>>
-<<= App.Desc.mods($activeChild, "hand")>>
-<<= App.Desc.mods($activeChild, "wrist")>>
-
-<<if $activeChild.fuckdoll == 0>>
-	<<if $activeChild.minorInjury != 0>>
-		<<if $activeChild.minorInjury != "sore ass">>
-			$He is sporting a @@.red;$activeChild.minorInjury,@@ covered by makeup.
-		<</if>>
-	<</if>>
-<</if>>
-
-<br>&nbsp;&nbsp;&nbsp;&nbsp;
-
-/* Calling all boob widgets */
-<<BoobsDescription>>
-<<boobsShapeDescription>>
-<<boobsExtraDescription>>
-<<= App.Desc.mods($activeChild, "chest")>>
-<<= App.Desc.mods($activeChild, "breast")>>
-<<shouldersDescription>>
-<<nipplesDescription>>
-<<= App.Desc.mods($activeChild, "nipple")>>
-<<areolaeDescription>>
-
-<<if $activeChild.inflation > 0>> /* to be obsoleted with phase 4 */
-	<<BellyInflationDescription>>
-<<elseif $activeChild.bellyImplant >= 2000>>
-	<<BellyImplantDescription>>
-<<else>>
-	<<BellyDescription>>
-<</if>>
-<<= App.Desc.mods($activeChild, "belly")>>
-<<ButtDescription>>
-
-<br>&nbsp;&nbsp;&nbsp;&nbsp;
-
-<<crotchDescription>>
-<<dickDescription>>
-<<vaginaDescription>>
-
-<<AnusDescription>>
-
-<<if $activeChild.fuckdoll == 0>>
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<switch $activeChild.drugs>>
-	<<case "super fertility drugs">>
-		<<if isFertile($activeChild) && $activeChild.preg == 0>>
-			$He is constantly dripping sexual fluids and $his breasts and belly are slightly swollen. The super fertility drugs have $him ready to be impregnated.
-		<</if>>
-	<<case "fertility drugs">>
-		<<if isFertile($activeChild) && $activeChild.preg == 0>>
-			$He smells of sexual fluids and $his breasts are slightly swollen. The fertility drugs have $him ready to be impregnated.
-		<</if>>
-	<<case "intensive breast injections">>
-		<<if (hasAnyArms($activeChild))>>$He massages $his tits uncomfortably<<else>>$He squirms under the unfamiliar weight on $his chest<</if>>. The A-HGH must be having an effect, painfully stretching $his breasts as the mammary and adipose tissue underneath grows explosively.
-	<<case "hyper breast injections">>
-		<<if (hasAnyArms($activeChild))>>$He massages $his tits uncomfortably<<else>>$He squirms under the unfamiliar weight on $his chest<</if>>. The HA-HGH must be having an effect, painfully stretching $his breasts as the mammary and adipose tissue underneath grows explosively.
-	<<case "intensive butt injections">>
-		<<if (hasAnyArms($activeChild))>>$He massages $his butt uncomfortably<<else>>$He squirms against the unfamiliar weight on $his backside<</if>>. The A-HGH must be having an effect, painfully stretching $his buttocks as the muscular and adipose tissue underneath grows explosively.
-	<<case "hyper butt injections">>
-		<<if (hasAnyArms($activeChild))>>$He massages $his butt uncomfortably<<else>>$He squirms against the unfamiliar weight on $his backside<</if>>. The HA-HGH must be having an effect, painfully stretching $his buttocks as the muscular and adipose tissue underneath grows explosively.
-	<<case "intensive penis enhancement">>
-		<<if (hasAnyArms($activeChild))>>$He massages $his <<if ($activeChild.dick > 0)>>dick<<else>>clit<</if>> uncomfortably<<else>>$He squirms against the unfamiliar weight in $his <<if ($activeChild.dick > 0)>>dick<<else>>clit<</if>><</if>>. The A-HGH must be having an effect, painfully lengthening and thickening $his <<if ($activeChild.dick > 0)>>dick<<else>>clit<</if>>.
-	<<case "intensive testicle enhancement">>
-		<<if (hasAnyArms($activeChild))>>$He massages $his balls uncomfortably<<else>>$He squirms in response to the pressure in $his balls<</if>> as a bead of cum forms on tip of $his dick. The A-HGH must be having an effect, painfully expanding $his testicles.
-	<<case "hyper penis enhancement">>
-		<<if (hasAnyArms($activeChild))>>$He massages $his <<if ($activeChild.dick > 0)>>dick<<else>>clit<</if>> uncomfortably<<else>>$He squirms against the unfamiliar weight in $his <<if ($activeChild.dick > 0)>>dick<<else>>clit<</if>><</if>>. The HA-HGH must be having an effect, painfully lengthening and thickening $his <<if ($activeChild.dick > 0)>>dick<<else>>clit<</if>>.
-	<<case "hyper testicle enhancement">>
-		<<if $activeChild.balls < 20>>
-			<<if (hasAnyArms($activeChild))>>$He massages $his balls uncomfortably<<else>>$He squirms in response to the pressure in $his balls<</if>> as cum drools from the tip of $his dick. The HA-HGH must be having an effect, painfully expanding $his testicles.
-		<<elseif $activeChild.balls >= 50>>
-			<<if (hasAnyArms($activeChild))>>$He massages $his balls uncomfortably<<else>>$He squirms in response to the pressure in $his balls<</if>> as a thick cascade of cum pours from the tip of $his cock. The HA-HGH must be having an effect, painfully expanding $his testicles.
-		<<elseif $activeChild.balls >= 37>>
-			<<if (hasAnyArms($activeChild))>>$He massages $his balls uncomfortably<<else>>$He squirms in response to the pressure in $his balls<</if>> as cum freely flows from the tip of $his cock, pooling under $him. The HA-HGH must be having an effect, painfully expanding $his testicles.
-		<<elseif $activeChild.balls >= 20>>
-			<<if (hasAnyArms($activeChild))>>$He massages $his balls uncomfortably<<else>>$He squirms in response to the pressure in $his balls<</if>> as precum pools under $him. The HA-HGH must be having an effect, painfully expanding $his testicles.
-		<</if>>
-	<<case "female hormone injections" "male hormone injections">>
-		$He looks very ill, likely a side effect of the extreme hormone injections.
-	<<case "appetite suppressors">>
-		Despite how little $he has been eating lately, $his stomach barely growls at all.
-	<<case "penis atrophiers">>
-		<<if (hasAnyArms($activeChild))>>$He massages $his dick uncomfortably<<else>>$He squirms in response to the discomfort in $his dick<</if>>. The A-TRPH must be having an effect, painfully causing $his body to atrophy $his dick.
-	<<case "testicle atrophiers">>
-		<<if (hasAnyArms($activeChild))>>$He massages $his balls uncomfortably<<else>>$He squirms in response to the discomfort in $his balls<</if>>. The A-TRPH must be having an effect, painfully causing $his body to atrophy $his testicles.
-	<<case "clitoris atrophiers">>
-		<<if (hasAnyArms($activeChild))>>$He massages $his clit uncomfortably<<else>>$He squirms in response to the discomfort in $his clit<</if>>. The A-TRPH must be having an effect, painfully causing $his body to atrophy $his clitoris.
-	<<case "labia atrophiers">>
-		<<if (hasAnyArms($activeChild))>>$He massages $his pussy uncomfortably<<else>>$He squirms in response to the discomfort in $his cunt<</if>>. The A-TRPH must be having an effect, painfully causing $his body to atrophy $his labia.
-	<<case "nipple atrophiers">>
-		<<if (hasAnyArms($activeChild))>>$He massages $his nipples uncomfortably<<else>>$He squirms in response to the discomfort in $his breasts<</if>>. The A-TRPH must be having an effect, painfully causing $his body to atrophy $his nipples.
-	<<case "lip atrophiers">>
-		<<if (hasAnyArms($activeChild))>>$He massages $his lips uncomfortably<<else>>$He licks $his lips uncomfortably<</if>>. The A-TRPH must be having an effect, painfully causing $his body to atrophy $his lips.
-	<<case "breast redistributors">>
-		<<if (hasAnyArms($activeChild))>>$He pinches at the fat building on $his belly and lets off a sigh<<else>>$He squirms under the added weight building on $his belly<</if>>. The RDST-D must be having an effect, encouraging $his body to redistribute $his breasts' adipose tissue to $his middle.
-	<<case "butt redistributors">>
-		<<if (hasAnyArms($activeChild))>>$He pinches at the fat building on $his belly and lets off a sigh<<else>>$He squirms under the added weight building on $his belly<</if>>. The RDST-D must be having an effect, encouraging $his body to redistribute $his buttock's adipose tissue to $his middle.
-	<<case "sag-B-gone">>
-		$His breasts are shiny from the layer of anti-sag cream rubbed onto them. They might be a little perkier, or not.
-	<<default>>
-	<</switch>>
-	<<if $activeChild.aphrodisiacs > 0 || $activeChild.inflationType == "aphrodisiacs">>
-		<<if $activeChild.inflationType == "aphrodisiacs">>
-			$He's literally full of
-			<<if (!hasAnyArms($activeChild))>>
-				aphrodisiacs, but is an amputee, so $he cannot touch $himself. $He writhes with extreme sexual frustration, desperately trying to relieve $himself, but only managing to stir up the aphrodisiacs contained in $his gut, strengthening their effects even more.
-			<<elseif ($activeChild.chastityAnus) && ($activeChild.chastityPenis) && ($activeChild.chastityVagina)>>
-				aphrodisiacs, but is wearing a chastity belt and cannot touch $himself. $He writhes with extreme sexual frustration, desperately trying to relieve $himself, but only managing to stir up the aphrodisiacs contained in $his gut, strengthening their effects even more.
-			<<elseif ($activeChild.releaseRules == "permissive" || $activeChild.releaseRules == "masturbation") && ($activeChild.dick != 0) && ($activeChild.vagina == -1)>>
-				aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his shaft with <<if (hasBothArms($activeChild))>>one hand while $he fingers $his anus with the other<<else>>$his hand<</if>>.<<if canPenetrate($activeChild)>> $His cock is painfully erect.<</if>> $His frantic masturbation forces $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
-			<<elseif ($activeChild.releaseRules == "permissive" || $activeChild.releaseRules == "masturbation") && ($activeChild.dick != 0)>>
-				aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his shaft and pussy with <<if (hasBothArms($activeChild))>>one hand while $he fingers $his anus with the other<<else>>$his hand<</if>>.<<if canPenetrate($activeChild)>> $His cock is painfully erect.<</if>> $His frantic masturbation forces $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
-			<<elseif ($activeChild.releaseRules == "permissive" || $activeChild.releaseRules == "masturbation") && ($activeChild.vagina == -1)>>
-				aphrodisiacs, has<<if $seeDicks > 0>> no penis and<</if>> no vagina, and is allowed to masturbate, so as $he stands before you $he
-				<<if $activeChild.anus == 0>>
-					plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get $himself off. $His frantic attempts force $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
-				<<else>>
-					uses <<if $activeChild.anus > 2>>$his entire hand, formed into a beak shape,<<elseif $activeChild.anus > 1>>two fingers<<else>>a finger<</if>> to fuck $his own ass. $His frantic attempts force $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
-				<</if>>
-			<<elseif ($activeChild.releaseRules == "permissive" || $activeChild.releaseRules == "masturbation")>>
-				aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his clit with <<if (hasBothArms($activeChild))>>one hand while $he fingers $his anus with the other<<else>>$his hand<</if>>.
-			<<elseif ($activeChild.dick != 0)>>
-				aphrodisiacs and is not allowed to masturbate, so as $he stands before you $he desperately presents $his open mouth, $his breasts, $his crotch, and $his anus in turn, hoping that something will entice you to give $him relief.<<if canPenetrate($activeChild)>> $His cock is painfully erect.<</if>>
-			<<elseif ($activeChild.vagina == -1)>>
-				aphrodisiacs, has<<if $seeDicks > 0>> no penis and<</if>> no vagina, and is not allowed to masturbate, so as $he stands before you $he desperately presents $his asshole, desperately hoping you'll fuck $his only real source of relief.
-			<<else>>
-				aphrodisiacs and is not allowed to masturbate, so as $he stands before you $he desperately presents $his open mouth, $his breasts, $his pussy, and $his anus in turn, hoping that something will entice you to give $him relief.
-			<</if>>
-		<<elseif $activeChild.aphrodisiacs > 1>>
-			$He's swimming in
-			<<if (!hasAnyArms($activeChild))>>
-				aphrodisiacs, but is an amputee, so $he cannot touch $himself. $He writhes with extreme sexual frustration, desperately trying to relieve $himself.
-			<<elseif ($activeChild.chastityAnus) && ($activeChild.chastityPenis) && ($activeChild.chastityVagina)>>
-				aphrodisiacs, but is wearing a chastity belt and cannot touch $himself. $He writhes with extreme sexual frustration, desperately trying to relieve $himself.
-			<<elseif ($activeChild.releaseRules == "permissive" || $activeChild.releaseRules == "masturbation") && ($activeChild.dick != 0) && ($activeChild.vagina == -1)>>
-				aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his shaft with <<if (hasBothArms($activeChild))>>one hand while $he fingers $his anus with the other<<else>>$his hand<</if>>.<<if canPenetrate($activeChild)>> $His cock is painfully erect.<</if>>
-			<<elseif ($activeChild.releaseRules == "permissive" || $activeChild.releaseRules == "masturbation") && ($activeChild.dick != 0)>>
-				aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his shaft and pussy with <<if (hasBothArms($activeChild))>>one hand while $he fingers $his anus with the other<<else>>$his hand<</if>>.<<if canPenetrate($activeChild)>> $His cock is painfully erect.<</if>>
-			<<elseif ($activeChild.releaseRules == "permissive" || $activeChild.releaseRules == "masturbation") && ($activeChild.vagina == -1)>>
-				aphrodisiacs, has<<if $seeDicks > 0>> no penis and<</if>> no vagina, and is allowed to masturbate, so as $he stands before you $he
-				<<if $activeChild.anus == 0>>
-					plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get $himself off.
-				<<else>>
-					uses <<if $activeChild.anus > 2>>$his entire hand, formed into a beak shape,<<elseif $activeChild.anus > 1>>two fingers<<else>>a finger<</if>> to fuck $his own ass.
-				<</if>>
-			<<elseif ($activeChild.releaseRules == "permissive" || $activeChild.releaseRules == "masturbation")>>
-				aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his clit with <<if (hasBothArms($activeChild))>>one hand while $he fingers $his anus with the other<<else>>$his hand<</if>>.
-			<<elseif ($activeChild.dick != 0)>>
-				aphrodisiacs and is not allowed to masturbate, so as $he stands before you $he desperately presents $his open mouth, $his breasts, $his crotch, and $his anus in turn, hoping that something will entice you to give $him relief.<<if canPenetrate($activeChild)>> $His cock is painfully erect.<</if>>
-			<<elseif ($activeChild.vagina == -1)>>
-				aphrodisiacs, has<<if $seeDicks > 0>> no penis and<</if>> no vagina, and is not allowed to masturbate, so as $he stands before you $he desperately presents $his asshole, desperately hoping you'll fuck $his only real source of relief.
-			<<else>>
-				aphrodisiacs and is not allowed to masturbate, so as $he stands before you $he desperately presents $his open mouth, $his breasts, $his pussy, and $his anus in turn, hoping that something will entice you to give $him relief.
-			<</if>>
-		<<else>>
-			<<if (!hasAnyArms($activeChild))>>
-				$He's on aphrodisiacs, but is an amputee, so $he cannot touch $himself. $He writhes with sexual frustration.
-			<<elseif ($activeChild.chastityAnus) && ($activeChild.chastityPenis) && ($activeChild.chastityVagina)>>
-				$He's on aphrodisiacs, but is wearing a chastity belt and cannot touch $himself. $He writhes with sexual frustration.
-			<<elseif ($activeChild.releaseRules == "permissive" || $activeChild.releaseRules == "masturbation") && ($activeChild.dick != 0) && ($activeChild.vagina == -1)>>
-				$He's on aphrodisiacs and is allowed to masturbate, so as $he obeys your commands $he idly rubs $his shaft with <<if (hasBothArms($activeChild))>>one hand while the other pinches a nipple<<else>>$his hand<</if>>.
-			<<elseif ($activeChild.releaseRules == "permissive" || $activeChild.releaseRules == "masturbation") && ($activeChild.dick != 0)>>
-				$He's on aphrodisiacs and is allowed to masturbate, so as $he obeys your commands $he idly rubs $his shaft and pussy with <<if (hasBothArms($activeChild))>>one hand while the other pinches a nipple<<else>>$his hand<</if>>.
-			<<elseif ($activeChild.releaseRules == "permissive" || $activeChild.releaseRules == "masturbation")>>
-				$He's on aphrodisiacs and is allowed to masturbate, so as $he obeys your commands $he idly rubs $his pussy with <<if (hasBothArms($activeChild))>>one hand while the other pinches a nipple<<else>>$his hand<</if>>.
-			<<elseif ($activeChild.dick != 0) && canPenetrate($activeChild)>>
-				$He's on aphrodisiacs and is not allowed to masturbate, so as $he obeys your commands $he shifts $his weight uncomfortably. $His erect dick sways as $he does.
-			<<else>>
-				$He's on aphrodisiacs and is not allowed to masturbate, so as $he obeys your commands $he shifts $his weight uncomfortably.
-			<</if>>
-		<</if>>
-	<</if>>
-	<<if ($activeChild.addict > 0) && ($activeChild.addict <= 2)>>
-		$He is a new @@.cyan;aphrodisiac addict.@@
-	<<elseif ($activeChild.addict > 0) && ($activeChild.addict < 10)>>
-		$He is a confirmed @@.cyan;aphrodisiac addict.@@
-	<<elseif ($activeChild.addict > 0)>>
-		$He is completely @@.cyan;dependent on aphrodisiacs,@@ and it is unlikely you will ever be able to wean $him off them.
-	<</if>>
-<</if>>
-
-<<set $saleDescription = 0, $applyLaw = 0>> /* clear sale and law flags, if set */
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 3ced715db84eff00b07aebbad2272f226873919f..805719be4f8c73a2b48393494649f170af5d55fc 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -1005,8 +1005,8 @@ equine: {type: "equine", normalOvaMin:1, normalOvaMax: 1, normalBirth: 48, minLi
 <<set setup.nicaraguanSlaveSurnames = ["Aburto", "Acevedo", "Acuna", "Acuña", "Aguilar", "Aguilera", "Aguirre", "Aleman", "Alemán", "Alfaro", "Alfrao", "Altamirano", "Alvarado", "Alvarez", "Álvarez", "Amador", "Aragon", "Arauz", "Arguello", "Arias", "Arteaga", "Artola", "Baltodano", "Barrera", "Benavides", "Bermudez", "Blanco", "Blandon", "Bolaños", "Bonilla", "Bravo", "Brenes", "Caceres", "Calderon", "Calero", "Campos", "Canales", "Canelo", "Cano", "Carazo", "Cardenas", "Cárdenas", "Carmona", "Castellon", "Castillo", "Castro", "Centeno", "Cerda", "Chamorro", "Chavarria", "Chavez", "Corea", "Cornejo", "Cortes", "Cortez", "Cruz", "Cuadra", "Davila", "Delgado", "Diaz", "Díaz", "Duarte", "Escobar", "Eslaquit", "Espinosa", "Espinoza", "Estrada", "Fernandez", "Figueroa", "Flores", "Fonseca", "Fornos", "Fuentes", "Gaitan", "Galeano", "Garcia", "García", "Garth", "Gomez", "Gonzales", "Gonzalez", "Granados", "Green", "Guadamuz", "Guerrero", "Guevara", "Guido", "Guillen", "Guillén", "Gutierrez", "Guzman", "Hernandez", "Herrera", "Huete", "Hurtado", "Jarquin", "Jarquín", "Jimenez", "Jiron", "Juarez", "Lacayo", "Laguna", "Lara", "Larios", "Lazo", "Leiva", "Lira", "Lisby", "Loaisiga", "Lopez", "Lugo", "Luna", "Macahado", "Madriz", "Mairena", "Maradiaga", "Marenco", "Marin", "Martinez", "Martínez", "Matamoros", "Mayorga", "Medina", "Medrano", "Mejia", "Membreño", "Mena", "Mendez", "Mendieta", "Mendoza", "Mercado", "Meza", "Miranda", "Molina", "Moncada", "Montenegro", "Montiel", "Montoya", "Mora", "Morales", "Moran", "Morazán", "Moreno", "Munguia", "Muñoz", "Murillo", "Narváes", "Narvaez", "Narváez", "Navarrete", "Navarro", "Newball", "Nuñez", "Núñez", "Obando", "Obregon", "Ochoa", "Ocon", "Olivas", "Oporta", "Ordoñez", "Orozco", "Ortega", "Ortiz", "Osorno", "Padilla", "Palacios", "Palma", "Parrales", "Pastora", "Pavon", "Pena", "Peralta", "Perez", "Pérez", "Picado", "Pineda", "Ponce", "Portobanco", "Quesada", "Quintero", "Quiroz", "Ramirez", "Ramírez", "Ramos", "Rayo", "Reyes", "Rios", "Rivas", "Rivera", "Rizo", "Robleto", "Rocha", "Rodriguez", "Rodríguez", "Rojas", "Romero", "Rosales", "Rostran", "Rugama", "Ruiz", "Sacasa", "Saenz", "Salazar", "Salgado", "Salinas", "Salmeron", "Sanchez", "Sánchez", "Sandino", "Sandoval", "Selva", "Sequeira", "Sevilla", "Siles", "Silva", "Solano", "Solis", "Solorzano", "Solórzano", "Somoza", "Soza", "Suarez", "Suazo", "Talavera", "Tapia", "Tellez", "Tercero", "Tinoco", "Torres", "Torrez", "Toruño", "Traña", "Treminio", "Turcios", "Ubeda", "Ugarte", "Ulloa", "Urbina", "Uriza", "Valdivia", "Valladares", "Valle", "Vallecillo", "Vallejos", "Vanegas", "Vargas", "Vasquez", "Vásquez", "Vega", "Velasquez", "Velez", "Veliz", "Véliz", "Vilchez", "Villalobos", "Vivas", "Zambrana", "Zamora", "Zapata", "Zavala", "Zelaya", "Zeledon", "Zeledón", "Zepeda", "Zuñiga"]>>
 
 <<set setup.nigerianSlaveNames = ["Aisha", "Aanu", "Abayami", "Abegunde", "Abejide", "Abeni", "Abi", "Abidemi", "Abigail", "Abike", "Abimbola", "Ada", "Adaeze", "Adaezennaya", "Adama", "Adamma", "Adanma", "Adanna", "Adannaya", "Adaobi", "Adaoma", "Adaora", "Adeagbo", "Adebola", "Adebomi", "Adedagbo", "Adedayo", "Adedoyin", "Adegboyega", "Adegoke", "Adejola", "Adekanye", "Adelabu", "Adelaja", "Adeola", "Adeporo", "Aderonke", "Aderounmu", "Adesina", "Adesua", "Adesuwa", "Adetokunbo", "Adewole", "Adeyemi", "Adunni", "Adunola", "Affiong", "Afiya", "Agbani", "Aina", "Aisha", "Ajagbe", "Ajala", "Ajayi", "Ajoke", "Akachi", "Akaninyene", "Akanke", "Akano", "Akon", "Aku", "Akuchi", "Akueke", "Akueni", "Akumjeli", "Akure", "Alafin", "Altine", "Amachea", "Amacheah", "Amachee", "Amachey", "Amachi", "Amachie", "Amachy", "Amachye", "Amadi", "Amaka", "Amaogechukwu", "Amara", "Amarachi", "Amarachukwu", "Amina", "Aminat", "Aminatu", "Amoge", "Amonke", "Anasi", "Ani", "Aniekan", "Aniweta", "Anna", "Annakiya", "Anuli", "Anulika", "Aole", "Aret", "Arit", "Ariyike", "Arziki", "Asabe", "Asinia", "Assibi", "Asura", "Atiba", "Atim", "Audi", "Auta", "Awatt", "Awogbemi", "Ayesho", "Ayoka", "Ayoluwa", "Ayomide", "Ayoola", "Baba", "Babatunji", "Balaraba", "Banjoko", "Bassey", "Batufon", "Batunya", "Bayo", "Beatrice", "Bianca", "Bikiya", "Bimbo", "Blessing", "Bolanile", "Bukky", "Bukola", "Bunmi", "Catherine", "Cecilia", "Celia", "Charity", "Chi", "Chiamaka", "Chibueze", "Chibugo", "Chibuifem", "Chibuike", "Chibuzo", "Chichi", "Chidea", "Chideah", "Chidee", "Chidera", "Chidey", "Chidi", "Chidie", "Chidiebere", "Chidiebube", "Chidiegwu", "Chidimma", "Chidinma", "Chidumaga", "Chidy", "Chielo", "Chiemela", "Chijindum", "Chika", "Chikanso", "Chikaodili", "Chike", "Chikelu", "Chikere", "Chikwendu", "Chima", "Chimaijem", "Chimaobim", "Chinagorom", "Chinaka", "Chinara", "Chinasa", "Chinaza", "Chinecherem", "Chinedu", "Chinelo", "Chinemeremma", "Chinese", "Chineze", "Chinira", "Chinonso", "Chinonye", "Chinue", "Chinwe", "Chinweike", "Chinwendu", "Chinweuba", "Chinyelu", "Chinyere", "Chioma", "Chizoba", "Chizuoke", "Chononso", "Christy", "Chukwudi", "Chukwuebuka", "Chukwuka", "Cinese", "Claire", "Clarion", "Dada Ogbegun", "Dada", "Dakore", "Daluchi", "Daluchineke", "Damilola", "Dara", "Daramola", "Daura", "Dayo", "Delu", "Dominique", "Dorcas", "Doreen", "Doris", "Ebele", "Ebéle", "Ebelechukwu", "Ebinabo", "Ebiti", "Ebuka", "Ebun", "Echerem", "Edidiongabasi", "Edima", "Edoamaowo", "Efahesun", "Efunroye", "Ega", "Ejimofor", "Ekanem", "Ekebo", "Ekei", "Ekene", "Ekenedilichukwu", "Ekpeyoawan", "Eku", "Ekwefi", "Elizabeth", "Eme", "Emeh", "Erinle Abatan", "Erinle Ibu Igberi", "Erinle Ibu Oso", "Erinle Ojutu", "Erinle Ondu", "Erinola", "Erioku", "Eshe", "Esther", "Etaoku", "Etim", "Ewegbemi", "Eweji", "Ewon-Obong", "Eyoanwan", "Ezelagbo", "Ezinma", "Ezinne", "Faith", "Falilat", "Fatima", "Fatimoh", "Fausat", "Fayola", "Fedekemi", "Florence", "Fola", "Folake", "Folashade", "Folayan", "Foluke", "Fumnanya", "Funanya", "Funke", "Funlola", "Funmi", "Funmilayo", "Gaddo", "Gbemisola", "Gbodi", "Genevieve", "Georgina", "Ginika", "Glory", "Gorom", "Grace", "Gude", "Gumbo", "Gwamniru", "Habeeba", "Hadiza", "Halim", "Halimnye", "Hanazullunni", "Hannah", "Hasana", "Helen", "Hellen", "Henrietta", "Huseina", "Idi", "Idowu", "Ifama", "Ifamah", "Ifamma", "Ifammah", "Ifasen", "Ifeanyi", "Ifenyinwa", "Ifeoma", "Ifunanya", "Ify", "Ige", "Ijendu", "Ijeoma", "Ikwo", "Ilori", "Imaabasi", "Ini", "Inibehe", "Iniko", "Iquo", "Iqwo", "Iretiola", "Iruka", "Isabella", "Isang", "Ishola", "Isio", "Itsemhike", "Iverem", "Iweobiegbulam", "Iyabo", "Iyabode", "Iyalenu", "Iyara", "Jaja", "Jemima", "Jibade", "Joke", "Joy", "Judith", "Jummai", "Jumoke", "Justine", "Kaka", "Kambina", "Kambiri", "Kande", "Kayin", "Kayode", "Kebe", "Kehinde", "Keira", "Kelechi", "Kemi", "Khabirat", "Kikelomo", "Kokumo", "Kolawole", "Korede", "Korin", "Koshi", "Kosoko", "Kudirat", "Kufre-Obong", "Kunle", "Labalaba", "Ladi", "Lami", "Laminde", "Lanre", "Lantala", "Lantana", "Lanti", "Laraba", "Larai", "Lauretu", "Linda", "Lisha", "Lovelyn", "Lubabah", "Lyapo", "Madu", "Maduabuchim", "Madukaego", "Margaret", "Marie", "Maris", "Marka", "Mary", "Maureen", "Mazi", "Mbafor", "Mbeke", "Mercy", "Mgbafo", "Mgbankwo", "Mgbeke", "Mgbogo", "Mgbonkwo", "Mgborie", "Michelle", "Modupe", "Mojisola", "Monafiki", "Mongo", "Monifa", "Mosun", "Muizat", "Muma", "Munachiso", "N'neka", "N'nenaya", "Nagode", "Nancy", "Nayo", "Ndidi", "Ndina", "Ndu", "Ndulu", "Nene", "Ngozi", "Njide", "Nkechi", "Nkechinyere", "Nkeiruka", "Nkem", "Nkemakonam", "Nkemdilim", "Nkiru", "Nkiruka", "Nkoli", "Nkoyo", "Nneka", "Nnenna", "Nnenne", "Nonye", "Nonyelum", "Nsa", "Nse", "Nsemeke", "Nseobong", "Nsi", "Nsidibe Abasi", "Nsikak", "Nsini-Abasi", "Nwabudike", "Nwakasi", "Nwakego", "Nwamaka", "Nwanneka", "Nwayieke", "Nya", "Oba", "Obadele", "Obanjoko", "Obawole", "Obi", "Obiageli", "Obialo", "Obioma", "Odera", "Odion", "Odu", "Offiong", "Ogbegun", "Oge", "Ogechi", "Ogechikamma", "Ogechukwu", "Ogechukwukama", "Ogunfiditimi", "Ojiugo", "Oke", "Okechuku", "Okechukwu", "Okpara", "Okwii", "Ola", "Olabisi", "Olabunmi", "Olakuotu", "Olamina", "Olaniyan", "Olatokunbo", "Olatunji", "Olisa", "Olubayo", "Oluchi", "Olufemi", "Olufunke", "Olugbadi", "Olugbala", "Oluranti", "Oluseyi", "Olushola", "Olutosin", "Oluwa", "Oluwaseyi", "Oluwatobiloba", "Omobola", "Omolara", "Omotayo", "Omotola", "Onaedo", "Onigbagbo", "Onochie", "Onuchukwu", "Onyeka", "Onyekachi", "Onyekachukwu", "Onyi", "Onyinechukwuka", "Onyinye", "Opo", "Opolopo", "Orishabiyi", "Osaze", "Otitodilichukwu", "Otokima-Abasi", "Otunla", "Otuosoro", "Oyedeji", "Oyinkan", "Ozioma", "Ozoemena", "Patience", "Patrica", "Precious", "Princess", "Promise", "Pupo", "Queen", "Rabo", "Rebecca", "Redeem", "Rega", "Regina", "Remi", "Rissikat", "Rita", "Rose", "Salako", "Salawa", "Sandra", "Sangoyomi", "Sarah", "Segun", "Shade", "Shangokoya", "Shangoyomi", "Sharde", "Shatu", "Shetu", "Soja", "Somkele", "Stella", "Stephanie", "Susan", "Sylvia", "Taiwo", "Talabi", "Talatu", "Tani", "Tanisha", "Tarana", "Tawn", "Tawno", "Temilola", "Temitope", "Theresa", "Tienepre", "Tiwa", "Tobi", "Toks", "Tosin", "Tunde", "Turunku", "Ubanwa", "Uchefuna", "Uchena", "Uchenah", "Uchenna", "Uchennah", "Udenkwo", "Udo", "Uduakobong", "Ugochi", "Ugoeze", "Ugonna", "Uhunoma", "Ukeme", "Ula", "Ulu", "Unyime", "Unyimeabasi", "Ure", "Urenna", "Urunwa", "Uyu", "Uzoamaka", "Uzochi", "Uzochukwu", "Uzodimma", "Uzoma", "Valentina", "Victoria", "Vivian", "Wana", "Wendy", "Wisfavour", "Wunmi", "Yalwa", "Yar Arziki", "Yar Jekada", "Yemi", "Yeside", "Yetade", "Yetide", "Yetunde", "Yewande", "Yinka", "Yobachukwu", "Yobanna", "Yomi", "Zaila", "Zainab", "Zamangirra", "Zikoranachukwudimma", "Zikoranaudodimma", "Zinachidi"]>>
-<<set setup.nigerianMaleNames = ["Aanu", "Abashe", "Abayami", "Abdulsalami", "Abegunde", "Abejide", "Abi", "Abidemi", "Abimbola", "Abubakar", "Achebe", "Adamu", "Adeagbo", "Adebola", "Adebomi", "Adedagbo", "Adedayo", "Adedoyin", "Adegboyega", "Adegoke", "Adejola", "Adekanye", "Adelabu", "Adelaja", "Aderonke", "Adesina", "Adetokunbo", "Adewale", "Adewole", "Adeyemi", "Ado", "Afamefula", "Afamefuna", "Afiya", "Agu", "Ajagbe", "Ajala", "Ajayi", "Ajike", "Ajofia", "Ajoke", "Ajuji", "Ajulu", "Ajuluchukwu", "Akabueze", "Akachi", "Akaninyene", "Akanke", "Akano", "Akin", "Akinkuotu", "Akinyemi", "Akobundu", "Akubundu", "Akuchi", "Akukalia", "Akumjeli", "Alade", "Alafin", "Alex", "Amadi", "Amaefula", "Amalinze", "Amazu", "Amikwu", "Aminu", "Amonke", "Andem", "Andom", "Anene", "Aniekan", "Anthony", "Antwon", "Anuli", "Anywanwu", "Aole", "Asibong", "Asinia", "Asuquo", "Atiba", "Atiku", "Augustus", "Auta", "Awatt", "Awogbemi", "Ayoka", "Ayoluwa", "Ayoola", "Azu", "Azubuike", "Baba", "Babafemi", "Babatunji", "Bakano", "Balarabe", "Banjoko", "Barmani", "Bassey", "Bayo", "Belonwu", "Beluchi", "BiSalla", "Bolaji", "Bolanile", "Buchi", "Charles", "Charlton", "Chee", "Chi", "Chiagoziem", "Chibueze", "Chibuike", "Chibuzo", "Chidea", "Chidee", "Chidey", "Chidi", "Chidie", "Chidiebere", "Chidiebube", "Chidiegwu", "Chidike", "Chidimma", "Chidubem", "Chidy", "Chiemeka", "Chigozie", "Chijindum", "Chijioke", "Chika", "Chike", "Chikelu", "Chikere", "Chikezie", "Chima", "Chimaijem", "Chinasa", "Chinaza", "Chinedu", "Chinelo", "Chinese", "Chineze", "Chino", "Chinonso", "Chinou", "Chinua", "Chinuah", "Chinue", "Chinwe", "Chinweike", "Chinwendu", "Chinweuba", "Chioke", "Chioma", "Chizoba", "Chononso", "Christian", "Chuks", "Chukwubuikem", "Chukwudi", "Chukwuemek", "Chukwuemeka", "Chukwuma", "Chukwura", "Chuma", "Chydea", "Chydee", "Chydey", "Chydi", "Chydie", "Chydy", "Chyke", "Ciwake", "Clement", "Cristian", "Dada Ogbegun", "Dada", "Dan Kano", "Dan More", "Danasabe", "Danjuma", "Danladi", "Danlami", "Dantala", "Dara", "Daramola", "Daren Tuwo", "Daren", "Davidson", "Dayo", "Deji", "Diji", "Dike", "Dikko", "Divine", "Dogo", "Dogon Jokado", "Dozie", "Duka", "Ebele", "Ebelegbulam", "Eberechukwu", "Ebitu", "Ebun", "Edet", "Edidiongabasi", "Edima", "Edose", "Efahesun", "Ega", "Egonwanne", "Ejowvokoghene", "Ekara", "Ekebo", "Ekei", "Ekene", "Ekenedilichukwu", "Ekeng", "Ekpenyong", "Ekwere", "Ekwueme", "Elegbede", "Elewechi", "Emefo", "Emeka", "Enefiok", "Enyinnaya", "Erinle Abatan", "Erinle Ibu Igberi", "Erinle Ibu Oso", "Erinle Ojutu", "Erinle Ondu", "Erinola", "Erioku", "Ernest", "Etaoku", "Etekamba", "Etim", "Etuk", "Eugene", "Ewegbemi", "Eweji", "Ewon-Obong", "Eyenmma", "Ezeani", "Ezeudu", "Fayola", "Fodio", "Fola", "Folayan", "Foluke", "Francis", "Fumnanya", "Gaddo", "Galadima", "Gbodi", "Gbolahan", "Goodluck", "Gozie", "Halim", "Halimnye", "Hassan", "Henry", "Husayn", "Husseini", "Ibe", "Ibeabuchi", "Ibekwe", "Ibezimako", "Ibrahim", "Ibrahm", "Idi", "Idigo", "Idowu", "Ifama", "Ifasen", "Ifeanyi", "Ifeanyichukwu", "Ifeatu", "Ifeoma", "Ige", "Iggi", "Igwelo", "Ijeawele", "Ijendu", "Ikechukwu", "Ikem", "Ikenna", "Ilom", "Ilori", "Ima Muma", "Inibehe", "Iniibege", "Innocent", "Inyang", "Ishola", "Isio", "Itam", "Itsifamus", "Iweobiegbulam", "Iyabo", "Iyabode", "Iyalenu", "Iyara", "Izuchukwu", "Jaja", "Jajah", "Jakada", "James", "Jamuike", "Jel", "Jelan", "Jelanea", "Jelanee", "Jelaney", "Jelani", "Jelanie", "Jelany", "Jibade", "Jideofor", "Jioke", "Jirgi", "Johnson", "Joseph", "Josh", "Jude", "Juji", "Jumoke", "Kamalu", "Kanye", "Kanyechukwuekele", "Kayin", "Kayode", "Kazeem", "Kehinde", "Kikelomo", "Kokumo", "Kolawole", "Koofrey", "Korin", "Kosoko", "Kufre-Obong", "Kunle", "Labalaba", "Lahidi", "Laraba", "Lee", "Lyapo", "Machi", "Madou", "Madu", "Maduabuchim", "Madue", "Maduka", "Madukaife", "Madukwe", "Mai Zaria", "Mazi", "Mazzi", "Michael", "Modupe", "Mohamed", "Mongo", "Moshood", "Muhammadu", "Munachiso", "Murtala", "Musa", "N'namdi", "N'neka", "Namadi", "Nayo", "Ndidi", "Ndueso", "Ndulu", "Ndulue", "Ngozi", "Nicholas", "Nkechi", "Nkemdilim", "Nkwocha", "Nmeregini", "Nnamdi", "Nnimmonu", "Noah", "Noma", "Nsa", "Nseobong", "Nsidibe Abasi", "Nsini-Abasi", "Nsisong", "Nwabudike", "Nwakibie", "Nwankwo", "Nweke", "Nwoye", "Nya", "Nyakno", "Oba", "Obadele", "Obanjoko", "Obasea", "Obasee", "Obasey", "Obasi", "Obasie", "Obasy", "Obawole", "Obea", "Obee", "Obey", "Obi", "Obiako", "Obie", "Obike", "Obio-Offiong", "Obioma", "Obiora", "Oby", "Obyke", "Odion", "Odu", "Offiong", "Ogbegun", "Ogbonna", "Ogbonnia", "Ogochukwu", "Ogunfiditimi", "Ojo", "Okafo", "Oke", "Okechuku", "Okechukwu", "Okeke", "Okeli", "Okon", "Okonkwo", "Okorie", "Okorle", "Okorocha", "Okoye", "Okpara", "Okparo", "Okparra", "Okparro", "Okwong", "Okwudilichukwu", "Ola", "Olabisi", "Olabunmi", "Oladipo", "Olamina", "Olaniyan", "Olapade", "Olatunji", "Olubayo", "Oluchi", "Olufemi", "Olufunke", "Olugbadi", "Olugbala", "Olusegun", "Oluseyi", "Olushola", "Olusoji", "Olutosin", "Oluwa", "Oluwaseyi", "Oluwatobiloba", "Omolara", "Onigbagbo", "Onuchukwu", "Onwuma", "Onyeka", "Onyekachi", "Onyekachukwu", "Onyemachi", "Onyeorulu", "Onyinechukwuka", "Onyinye", "Opo", "Opolopo", "Orishabiyi", "Orjea", "Orjee", "Orjey", "Orji", "Orjie", "Orjy", "Orok", "Orukpe", "Osaze", "Osmond", "Osondu", "Otito", "Otunla", "Ovieh", "Oyedeji", "Ozioma", "Ozo", "Ozoemena", "Peter", "Philip", "Pius", "Pupo", "Rabo", "Rapuokwu", "Risku", "Robert", "Salako", "Salihu", "Sangoyomi", "Sani", "Sean", "Segun", "Selim", "Shaba", "Shade", "Shangokoya", "Shangoyomi", "Sharde", "Shehu", "Shekarau", "Shola", "Shuka", "Sochi", "Soja", "Somayina", "Soudi", "Stephen", "Sunday", "Tade", "Taiwo", "Talabi", "Talatu", "Tanimu", "Tanko", "Tatau", "Tate", "Tatu", "Tawn", "Tawno", "Tekamba", "Temitope", "Timon", "Tobechukwu", "Tobeolisa", "Tobi", "Tosin", "Tunde", "Ubong", "Uche", "Uchea", "Uchechea", "Uchechee", "Uchechey", "Uchechi", "Uchechie", "Uchechy", "Uchee", "Uchenna", "Uchey", "Uchi", "Uchie", "Uchy", "Udegbulam", "Udegbunam", "Udo", "Uduakobong", "Ugochukwu", "Ugonna", "Ugoorji", "Ukegbu", "Ulu", "Umaru", "Unoka", "Unyime", "Unyimeabasi", "Utin", "Uwaezuoke", "Uwem", "Uyanwa", "Uzochi", "Uzochukwu", "Uzoma", "Uzowulu", "Yakubu", "Yalwa", "Yaro", "Yemi", "Yeside", "Yetade", "Yetunde", "Yewande", "Yobachukwu", "Yobanna", "Yohance", "Yusuf", "Zaki", "Zebenjo", "Zikoranaudodimma"]>>
-<<set setup.nigerianSlaveSurnames = ["Abani", "Abasi", "Abbas", "Abdullahi", "Abeni", "Abimbola", "Abiodun", "Abiola", "Abogunloko", "Abu", "Abubakar", "Abugan", "Achebe", "Acholonu", "Adadevoh", "Adamolekun", "Adams", "Adamu", "Ade", "Adebayo", "Adebimpe", "Adebiyi", "Adebowale", "Adeboye", "Adedeji", "Adedokun", "Adedoyin", "Adefuye", "Adegbalola", "Adegbile", "Adegbite", "Adegoke", "Adekoya", "Adekunle", "Adelakun", "Adeleke", "Adeleye", "Ademokoya", "Ademola", "Adeniji", "Adeniken", "Adeniran", "Adeniyi", "Adenowo", "Adenuga", "Adeoye", "Adepoju", "Aderin", "Adesanya", "Adesida", "Adesina", "Adetunji", "Adewale", "Adewole", "Adewoye", "Adewumi", "Adeyanju", "Adeyemi", "Adeyemo", "Adeyeye", "Adichie", "Adigun", "Adigwe", "Aduba", "Afamefula", "Afamefuna", "Afigbo", "Afolabi", "Afolayan", "Agbebaku", "Agbo", "Agboola", "Agu", "Agunwa", "Ahmed", "Aighewi", "Aikhomu", "Aina", "Aiyedogbon", "Aiyejina", "Aiyeku", "Ajakaiye", "Ajala", "Ajayi", "Ajibade", "Ajibefun", "Ajibola", "Ajiboye", "Ajose", "Ajulo", "Ajunwa", "Akabueze", "Akachi", "Akanbi", "Akande", "Akinboboye", "Akinkoye", "Akinnagbe", "Akinola", "Akinpelu", "Akinradewo", "Akinsanya", "Akintoye", "Akintunde", "Akinwale", "Akinwande", "Akinyemi", "Akinyinka", "Akiode", "Akor", "Akpan", "Akubilo", "Akubundu", "Akuchi", "Akumjeli", "Akwu", "Alabi", "Alade", "Aladekoba", "Alake", "Alakija", "Alao", "Ali", "Aliu", "Aliyu", "Alkali", "Alli", "Alo", "Alozie", "Aluko", "Amadi", "Amale", "Amata", "Amazu", "Amike", "Aminu", "Amusa", "Aniakor", "Anibaba", "Anthony", "Anusim", "Anwalimhobor", "Anyanwu", "Aradeon", "Aragbaye", "Aremu", "Ariyo", "Aromashodu", "Asomugha", "Asonze", "Atatalo", "Audu", "Augustine", "Awe", "Awojobi", "Awotunde", "Ayanbadejo", "Ayeni", "Ayodele", "Ayoola", "Ayuba", "Ayuk", "Azeez", "Azikiwe", "Azubuike", "Azuonye", "Baba", "Bababunmi", "Babalola", "Babatunde", "Bada", "Bade", "Baderinwa", "Baiyewu", "Bakare", "Balewa", "Balogun", "Bamidele", "Bamiro", "Banjo", "Bankole", "Banner", "Bashir", "Bashorun", "Bassey", "Bature", "Bayo", "Bazighe", "Bello", "Belonwu", "Beluchi", "Benson", "Biobaku", "Borishade", "Boye", "Braithwaite", "Brown", "Buchi", "Buhari", "Burja", "Chee", "Chi", "Chibueze", "Chibuike", "Chibuzo", "Chidea", "Chidee", "Chidey", "Chidi", "Chidie", "Chidiebere", "Chidiebube", "Chidiegwu", "Chidike", "Chidubem", "Chidy", "Chiemeka", "Chijindu", "Chijindum", "Chijioke", "Chika", "Chike", "Chikelu", "Chikere", "Chikezie", "Chima", "Chimaijem", "Chimezie", "Chinasa", "Chinaza", "Chinedu", "Chinelo", "Chinese", "Chineze", "Chino", "Chinou", "Chinua", "Chinuah", "Chinwe", "Chinweike", "Chinwendu", "Chinweuba", "Chioke", "Chioma", "Chizoba", "Chononso", "Choolon", "Chuks", "Chukwu", "Chukwubuikem", "Chukwudi", "Chukwuemeka", "Chukwuka", "Chukwuma", "Chydea", "Chydee", "Chydey", "Chydi", "Chydie", "Chydy", "Chyke", "Collins", "Dabiri", "Dagunduro", "Daniel", "Daramola", "Dare", "Darego", "Dauda", "David", "Diji", "Dike", "Dina", "Dingba", "Diogu", "Diya", "Domike", "Duncan", "Duru", "Ebele", "Ebor", "Echeruo", "Echinkunwoke", "Edet", "Edewor", "Edochie", "Edozie", "Effiong", "Egbeniyi", "Egbuson", "Egunjobi", "Ehizuelen", "Ejiofor", "Ejiro", "Eke", "Ekeh", "Ekeinde", "Ekene", "Ekenedilichukwu", "Ekpo", "Ekwensi", "Ekwueme", "Emecheta", "Emeka", "Emenanjo", "Emiola", "Emmanuel", "Enemkpali", "Enwezor", "Enwonwu", "Enyinnaya", "Erayokan", "Esogbue", "Essien", "Esua", "Esuene", "Etefia", "Etim", "Euba", "Eze", "Ezeh", "Ezekwesili", "Ezeogu", "Ezeugo", "Ezinwa", "Ezuruonye", "Fabiyi", "Faborede", "Faduma", "Fafunwa", "Fagbohun", "Fakeye", "Falola", "Faloye", "Falusi", "Familoni", "Famurewa", "Famuyiwa", "Fasasi", "Fasuba", "Fatinikun", "Fatiu", "Fatuga", "Fayemi", "Filani", "Francis", "Friday", "Fumnanya", "Gambari", "Garba", "Gbaja", "George", "Godwin", "Gowon", "Gunem", "Gwam", "Habe", "Halim", "Halimnye", "Hamajam", "Hassan", "Henshaw", "Hicks", "Ibadim", "Ibe", "Ibeabuchi", "Ibekwe", "Ibezimako", "Ibidapo", "Ibikunle", "Ibrahim", "Idehen", "Idiata", "Idowu", "Idris", "Ifeadi", "Ifeajuna", "Ifeanyichukwu", "Ifeatu", "Igbokwe", "Ige", "Igwe", "Iheme", "Ijeawele", "Ijeh", "Ijendu", "Ike", "Ikedieze", "Ikeji", "Ikem", "Ikenna", "Ikpeazu", "Ikpi", "Ikwuakor", "Imeh", "Imhoaperamhe", "Inyang", "Ipaye", "Isaac", "Isah", "Ishola", "Isola", "Isozoh", "Issac", "Itanyi", "Itodo", "Iweala", "Iweobiegbulam", "Iwundu", "Izuchukwu", "Jaja", "Jajah", "James", "Jamuike", "Jegede", "Jel", "Jelan", "Jelanea", "Jelanee", "Jelaney", "Jelani", "Jelanie", "Jelany", "Jideofor", "Jimoh", "Jioke", "John", "Johnson", "Jonathan", "Jones", "Joseph", "Joshua", "Junaidu", "Kabir", "Kalu", "Kaly", "Kanayo", "Kayode", "Kechere", "Kehinde", "Khumbanyiwa", "Kiaga", "Kolade", "Kolawole", "Koofrey", "Kumuyi", "Kuti", "Ladipo", "Lambo", "Lawal", "Mabogunje", "Madaki", "Madou", "Madu", "Maduabuchim", "Madubuike", "Madue", "Madukaife", "Madukwe", "Majekodunmo", "Makinde", "Manyika", "Martins", "Maude", "Mazi", "Mazzi", "Mba", "Mezu", "Michael", "Mimiko", "Mmeka", "Moemeka", "Mohammed", "Momoh", "Monye", "Moradeyo", "Moreno", "Morton", "Mosaku", "Moses", "Moweta", "Mozia", "Mozie", "Muhammad", "Muhammed", "Muhktar", "Munachiso", "Muoneke", "Musa", "Mustapha", "Ndibe", "Ndidi", "Nduka", "Ndukwe", "Ndulu", "Nelson", "Ngozi", "Njoku", "Njokuani", "Nkechi", "Nkemdilim", "Nnaji", "Nnamani", "Nnamdi", "Nsa", "Nsofor", "Nurudeen", "Nwabudike", "Nwachukwu", "Nwaise", "Nwanaga", "Nwankwo", "Nwapa", "Nweke", "Nwelue", "Nwoffiah", "Nwoko", "Nwosu", "Nwoye", "Nzekwu", "Obadike", "Obafunwa", "Obasea", "Obasee", "Obasey", "Obasi", "Obasie", "Obasy", "Obea", "Obee", "Obesere", "Obey", "Obi", "Obie", "Obielum", "Obike", "Obikwelu", "Obinna", "Obinwa", "Obiora", "Obisesan", "Obong", "Oby", "Obyke", "Ochuba", "Odeku", "Odion", "Odogwu", "Oduduru", "Odumegwu", "Odumosu", "Odutokun", "Oduwole", "Oduye", "Ofili", "Ogbonna", "Ogbonnia", "Ogbu", "Ogochukwu", "Ogoro", "Oguine", "Ogunbiyi", "Ogunde", "Ogundipe", "Ogunfiditimi", "Ogunkoya", "Ogunlesi", "Ogunleye", "Ogunmola", "Ogunnaike", "Ogunrinde", "Ogunsheye", "Ogwu", "Ogwumike", "Ohadugha", "Ohumotu", "Ojerinde", "Ojike", "Ojikutu", "Ojiudu", "Ojo", "Ojomo", "Ojopagogo", "Ojukwu", "Okafo", "Okafor", "Okagbare", "Okaome", "Oke", "Okeafor", "Okechukwu", "Okediji", "Okeke", "Okeli", "Okeniyi", "Okereke", "Okezie", "Oki", "Okigbo", "Okikiolu", "Okocha", "Okoh", "Okoli", "Okon", "Okonjo", "Okonkwo", "Okonma", "Okorafor", "Okore", "Okorie", "Okoro", "Okoroafor", "Okoye", "Okpara", "Okparaebo", "Okparo", "Okparra", "Okparro", "Okpuzu", "Okwara", "Okwei", "Okwelume", "Ola", "Oladapo", "Oladele", "Oladimeji", "Oladipo", "Oladipupo", "Oladopo", "Oladoye", "Olagundoye", "Olaiya", "Olajide", "Olajuwon", "Olaleye", "Olaniyan", "Olaniyi", "Olanrewaju", "Olarewaju", "Olaswere", "Olatunde", "Olatunji", "Olayiwola", "Olopade", "Olowora", "Oluanika", "Oluchi", "Olude", "Olukoju", "Olukotun", "Olumide", "Olupona", "Olusola", "Oluwafemi", "Omagbemi", "Omalu", "Omengboji", "Omenka", "Omenuko", "Omolade", "Omole", "Omolewa", "Omolola", "Omotola", "Omotoso", "Onabule", "Onatolu", "Onayemi", "Oni", "Onoh", "Onuchukwu", "Onuoha", "Onweagba", "Onwenu", "Ọnwụtalóbi", "Onyali", "Onyefulu", "Onyekachi", "Onyekachukwu", "Onyekwelu", "Onyekwene", "Onyewu", "Opara", "Opia", "Oriola", "Orjea", "Orjee", "Orjey", "Orji", "Orjie", "Orjy", "Oruche", "Osagie", "Osakalumi", "Osazuwa", "Osemele", "Oshinowo", "Oshoniyi", "Osinbajo", "Osofisan", "Osundare", "Osuntokun", "Osupa", "Otohwo", "Ovia", "Owoh", "Owolabi", "Oyedepo", "Oyediran", "Oyegunle", "Oyekan", "Oyelana", "Oyetoro", "Oyewole", "Oyewumi", "Ozioma", "Ozoemena", "Ozolua", "Paul", "Peter", "Peters", "Popoola", "Potts-Johnson", "Potts", "Raji", "Rumfa", "Sadiq", "Salako", "Salami", "Sambo", "Samson", "Samuel", "Sani", "Sanni", "Sanusi", "Sanya", "Shadare", "Shagari", "Shehu", "Shekoi", "Shittu", "Shonekan", "Simmons", "Smith", "Soboyejo", "Sodimu", "Sofola", "Sofolowe", "Solomon", "Somayina", "Sosimi", "Sotubo", "Sowande", "Soyinka", "Stephen", "Sulaiman", "Sule", "Suleiman", "Sunday", "Taiwo", "Temowo", "Tetuila", "Thomas", "Thompson", "Thorley", "Tijani", "Tobechukwu", "Torimiro", "Tubosun", "Ubogagu", "Uche", "Uchea", "Uchechea", "Uchechee", "Uchechey", "Uchechi", "Uchechie", "Uchechy", "Uchee", "Uchendu", "Uchey", "Uchi", "Uchie", "Uchy", "Udechukwu", "Udeg", "Udegbulam", "Udegbunam", "Udo", "Udoh", "Ugochukwu", "Ugonna", "Ugoorji", "Ugwu", "Ukpabio", "Umar", "Umeadi", "Umeh", "Umenyiora", "Umoh", "Umunna", "Unigwe", "Usman", "Utomi", "Utondu", "Uwaezuoke", "Uzochi", "Uzochukwu", "Uzoigwe", "Uzoma", "Victor", "Wall", "Wanogho", "Wey", "Williams", "Yahaya", "Yakubu", "Yekini", "Yobachukwu", "Yobanna", "Yusuf", "Zebenjo", "Zikoranaudodimma"]>>
+<<set setup.nigerianMaleNames = ["Babatunde", "Michael", "Aanu", "Abashe", "Abayami", "Abdulsalami", "Abegunde", "Abejide", "Abi", "Abidemi", "Abimbola", "Abubakar", "Achebe", "Adamu", "Adeagbo", "Adebola", "Adebomi", "Adedagbo", "Adedayo", "Adedoyin", "Adegboyega", "Adegoke", "Adejola", "Adekanye", "Adelabu", "Adelaja", "Aderonke", "Adesina", "Adetokunbo", "Adewale", "Adewole", "Adeyemi", "Ado", "Afamefula", "Afamefuna", "Afiya", "Agu", "Ajagbe", "Ajala", "Ajayi", "Ajike", "Ajofia", "Ajoke", "Ajuji", "Ajulu", "Ajuluchukwu", "Akabueze", "Akachi", "Akaninyene", "Akanke", "Akano", "Akin", "Akinkuotu", "Akinyemi", "Akobundu", "Akubundu", "Akuchi", "Akukalia", "Akumjeli", "Alade", "Alafin", "Alex", "Amadi", "Amaefula", "Amalinze", "Amazu", "Amikwu", "Aminu", "Amonke", "Andem", "Andom", "Anene", "Aniekan", "Anthony", "Antwon", "Anuli", "Anywanwu", "Aole", "Asibong", "Asinia", "Asuquo", "Atiba", "Atiku", "Augustus", "Auta", "Awatt", "Awogbemi", "Ayoka", "Ayoluwa", "Ayoola", "Azu", "Azubuike", "Baba", "Babafemi", "Babatunji", "Bakano", "Balarabe", "Banjoko", "Barmani", "Bassey", "Bayo", "Belonwu", "Beluchi", "BiSalla", "Bolaji", "Bolanile", "Buchi", "Charles", "Charlton", "Chee", "Chi", "Chiagoziem", "Chibueze", "Chibuike", "Chibuzo", "Chidea", "Chidee", "Chidey", "Chidi", "Chidie", "Chidiebere", "Chidiebube", "Chidiegwu", "Chidike", "Chidimma", "Chidubem", "Chidy", "Chiemeka", "Chigozie", "Chijindum", "Chijioke", "Chika", "Chike", "Chikelu", "Chikere", "Chikezie", "Chima", "Chimaijem", "Chinasa", "Chinaza", "Chinedu", "Chinelo", "Chinese", "Chineze", "Chino", "Chinonso", "Chinou", "Chinua", "Chinuah", "Chinue", "Chinwe", "Chinweike", "Chinwendu", "Chinweuba", "Chioke", "Chioma", "Chizoba", "Chononso", "Christian", "Chuks", "Chukwubuikem", "Chukwudi", "Chukwuemek", "Chukwuemeka", "Chukwuma", "Chukwura", "Chuma", "Chydea", "Chydee", "Chydey", "Chydi", "Chydie", "Chydy", "Chyke", "Ciwake", "Clement", "Cristian", "Dada Ogbegun", "Dada", "Dan Kano", "Dan More", "Danasabe", "Danjuma", "Danladi", "Danlami", "Dantala", "Dara", "Daramola", "Daren Tuwo", "Daren", "Davidson", "Dayo", "Deji", "Diji", "Dike", "Dikko", "Divine", "Dogo", "Dogon Jokado", "Dozie", "Duka", "Ebele", "Ebelegbulam", "Eberechukwu", "Ebitu", "Ebun", "Edet", "Edidiongabasi", "Edima", "Edose", "Efahesun", "Ega", "Egonwanne", "Ejowvokoghene", "Ekara", "Ekebo", "Ekei", "Ekene", "Ekenedilichukwu", "Ekeng", "Ekpenyong", "Ekwere", "Ekwueme", "Elegbede", "Elewechi", "Emefo", "Emeka", "Enefiok", "Enyinnaya", "Erinle Abatan", "Erinle Ibu Igberi", "Erinle Ibu Oso", "Erinle Ojutu", "Erinle Ondu", "Erinola", "Erioku", "Ernest", "Etaoku", "Etekamba", "Etim", "Etuk", "Eugene", "Ewegbemi", "Eweji", "Ewon-Obong", "Eyenmma", "Ezeani", "Ezeudu", "Fayola", "Fodio", "Fola", "Folayan", "Foluke", "Francis", "Fumnanya", "Gaddo", "Galadima", "Gbodi", "Gbolahan", "Goodluck", "Gozie", "Halim", "Halimnye", "Hassan", "Henry", "Husayn", "Husseini", "Ibe", "Ibeabuchi", "Ibekwe", "Ibezimako", "Ibrahim", "Ibrahm", "Idi", "Idigo", "Idowu", "Ifama", "Ifasen", "Ifeanyi", "Ifeanyichukwu", "Ifeatu", "Ifeoma", "Ige", "Iggi", "Igwelo", "Ijeawele", "Ijendu", "Ikechukwu", "Ikem", "Ikenna", "Ilom", "Ilori", "Ima Muma", "Inibehe", "Iniibege", "Innocent", "Inyang", "Ishola", "Isio", "Itam", "Itsifamus", "Iweobiegbulam", "Iyabo", "Iyabode", "Iyalenu", "Iyara", "Izuchukwu", "Jaja", "Jajah", "Jakada", "James", "Jamuike", "Jel", "Jelan", "Jelanea", "Jelanee", "Jelaney", "Jelani", "Jelanie", "Jelany", "Jibade", "Jideofor", "Jioke", "Jirgi", "Johnson", "Joseph", "Josh", "Jude", "Juji", "Jumoke", "Kamalu", "Kanye", "Kanyechukwuekele", "Kayin", "Kayode", "Kazeem", "Kehinde", "Kikelomo", "Kokumo", "Kolawole", "Koofrey", "Korin", "Kosoko", "Kufre-Obong", "Kunle", "Labalaba", "Lahidi", "Laraba", "Lee", "Lyapo", "Machi", "Madou", "Madu", "Maduabuchim", "Madue", "Maduka", "Madukaife", "Madukwe", "Mai Zaria", "Mazi", "Mazzi", "Michael", "Modupe", "Mohamed", "Mongo", "Moshood", "Muhammadu", "Munachiso", "Murtala", "Musa", "N'namdi", "N'neka", "Namadi", "Nayo", "Ndidi", "Ndueso", "Ndulu", "Ndulue", "Ngozi", "Nicholas", "Nkechi", "Nkemdilim", "Nkwocha", "Nmeregini", "Nnamdi", "Nnimmonu", "Noah", "Noma", "Nsa", "Nseobong", "Nsidibe Abasi", "Nsini-Abasi", "Nsisong", "Nwabudike", "Nwakibie", "Nwankwo", "Nweke", "Nwoye", "Nya", "Nyakno", "Oba", "Obadele", "Obanjoko", "Obasea", "Obasee", "Obasey", "Obasi", "Obasie", "Obasy", "Obawole", "Obea", "Obee", "Obey", "Obi", "Obiako", "Obie", "Obike", "Obio-Offiong", "Obioma", "Obiora", "Oby", "Obyke", "Odion", "Odu", "Offiong", "Ogbegun", "Ogbonna", "Ogbonnia", "Ogochukwu", "Ogunfiditimi", "Ojo", "Okafo", "Oke", "Okechuku", "Okechukwu", "Okeke", "Okeli", "Okon", "Okonkwo", "Okorie", "Okorle", "Okorocha", "Okoye", "Okpara", "Okparo", "Okparra", "Okparro", "Okwong", "Okwudilichukwu", "Ola", "Olabisi", "Olabunmi", "Oladipo", "Olamina", "Olaniyan", "Olapade", "Olatunji", "Olubayo", "Oluchi", "Olufemi", "Olufunke", "Olugbadi", "Olugbala", "Olusegun", "Oluseyi", "Olushola", "Olusoji", "Olutosin", "Oluwa", "Oluwaseyi", "Oluwatobiloba", "Omolara", "Onigbagbo", "Onuchukwu", "Onwuma", "Onyeka", "Onyekachi", "Onyekachukwu", "Onyemachi", "Onyeorulu", "Onyinechukwuka", "Onyinye", "Opo", "Opolopo", "Orishabiyi", "Orjea", "Orjee", "Orjey", "Orji", "Orjie", "Orjy", "Orok", "Orukpe", "Osaze", "Osmond", "Osondu", "Otito", "Otunla", "Ovieh", "Oyedeji", "Ozioma", "Ozo", "Ozoemena", "Peter", "Philip", "Pius", "Pupo", "Rabo", "Rapuokwu", "Risku", "Robert", "Salako", "Salihu", "Sangoyomi", "Sani", "Sean", "Segun", "Selim", "Shaba", "Shade", "Shangokoya", "Shangoyomi", "Sharde", "Shehu", "Shekarau", "Shola", "Shuka", "Sochi", "Soja", "Somayina", "Soudi", "Stephen", "Sunday", "Tade", "Taiwo", "Talabi", "Talatu", "Tanimu", "Tanko", "Tatau", "Tate", "Tatu", "Tawn", "Tawno", "Tekamba", "Temitope", "Timon", "Tobechukwu", "Tobeolisa", "Tobi", "Tosin", "Tunde", "Ubong", "Uche", "Uchea", "Uchechea", "Uchechee", "Uchechey", "Uchechi", "Uchechie", "Uchechy", "Uchee", "Uchenna", "Uchey", "Uchi", "Uchie", "Uchy", "Udegbulam", "Udegbunam", "Udo", "Uduakobong", "Ugochukwu", "Ugonna", "Ugoorji", "Ukegbu", "Ulu", "Umaru", "Unoka", "Unyime", "Unyimeabasi", "Utin", "Uwaezuoke", "Uwem", "Uyanwa", "Uzochi", "Uzochukwu", "Uzoma", "Uzowulu", "Yakubu", "Yalwa", "Yaro", "Yemi", "Yeside", "Yetade", "Yetunde", "Yewande", "Yobachukwu", "Yobanna", "Yohance", "Yusuf", "Zaki", "Zebenjo", "Zikoranaudodimma"]>>
+<<set setup.nigerianSlaveSurnames = ["Amoda", "Abani", "Abasi", "Abbas", "Abdullahi", "Abeni", "Abimbola", "Abiodun", "Abiola", "Abogunloko", "Abu", "Abubakar", "Abugan", "Achebe", "Acholonu", "Adadevoh", "Adamolekun", "Adams", "Adamu", "Ade", "Adebayo", "Adebimpe", "Adebiyi", "Adebowale", "Adeboye", "Adedeji", "Adedokun", "Adedoyin", "Adefuye", "Adegbalola", "Adegbile", "Adegbite", "Adegoke", "Adekoya", "Adekunle", "Adelakun", "Adeleke", "Adeleye", "Ademokoya", "Ademola", "Adeniji", "Adeniken", "Adeniran", "Adeniyi", "Adenowo", "Adenuga", "Adeoye", "Adepoju", "Aderin", "Adesanya", "Adesida", "Adesina", "Adetunji", "Adewale", "Adewole", "Adewoye", "Adewumi", "Adeyanju", "Adeyemi", "Adeyemo", "Adeyeye", "Adichie", "Adigun", "Adigwe", "Aduba", "Afamefula", "Afamefuna", "Afigbo", "Afolabi", "Afolayan", "Agbebaku", "Agbo", "Agboola", "Agu", "Agunwa", "Ahmed", "Aighewi", "Aikhomu", "Aina", "Aiyedogbon", "Aiyejina", "Aiyeku", "Ajakaiye", "Ajala", "Ajayi", "Ajibade", "Ajibefun", "Ajibola", "Ajiboye", "Ajose", "Ajulo", "Ajunwa", "Akabueze", "Akachi", "Akanbi", "Akande", "Akinboboye", "Akinkoye", "Akinnagbe", "Akinola", "Akinpelu", "Akinradewo", "Akinsanya", "Akintoye", "Akintunde", "Akinwale", "Akinwande", "Akinyemi", "Akinyinka", "Akiode", "Akor", "Akpan", "Akubilo", "Akubundu", "Akuchi", "Akumjeli", "Akwu", "Alabi", "Alade", "Aladekoba", "Alake", "Alakija", "Alao", "Ali", "Aliu", "Aliyu", "Alkali", "Alli", "Alo", "Alozie", "Aluko", "Amadi", "Amale", "Amata", "Amazu", "Amike", "Aminu", "Amusa", "Aniakor", "Anibaba", "Anthony", "Anusim", "Anwalimhobor", "Anyanwu", "Aradeon", "Aragbaye", "Aremu", "Ariyo", "Aromashodu", "Asomugha", "Asonze", "Atatalo", "Audu", "Augustine", "Awe", "Awojobi", "Awotunde", "Ayanbadejo", "Ayeni", "Ayodele", "Ayoola", "Ayuba", "Ayuk", "Azeez", "Azikiwe", "Azubuike", "Azuonye", "Baba", "Bababunmi", "Babalola", "Babatunde", "Bada", "Bade", "Baderinwa", "Baiyewu", "Bakare", "Balewa", "Balogun", "Bamidele", "Bamiro", "Banjo", "Bankole", "Banner", "Bashir", "Bashorun", "Bassey", "Bature", "Bayo", "Bazighe", "Bello", "Belonwu", "Beluchi", "Benson", "Biobaku", "Borishade", "Boye", "Braithwaite", "Brown", "Buchi", "Buhari", "Burja", "Chee", "Chi", "Chibueze", "Chibuike", "Chibuzo", "Chidea", "Chidee", "Chidey", "Chidi", "Chidie", "Chidiebere", "Chidiebube", "Chidiegwu", "Chidike", "Chidubem", "Chidy", "Chiemeka", "Chijindu", "Chijindum", "Chijioke", "Chika", "Chike", "Chikelu", "Chikere", "Chikezie", "Chima", "Chimaijem", "Chimezie", "Chinasa", "Chinaza", "Chinedu", "Chinelo", "Chinese", "Chineze", "Chino", "Chinou", "Chinua", "Chinuah", "Chinwe", "Chinweike", "Chinwendu", "Chinweuba", "Chioke", "Chioma", "Chizoba", "Chononso", "Choolon", "Chuks", "Chukwu", "Chukwubuikem", "Chukwudi", "Chukwuemeka", "Chukwuka", "Chukwuma", "Chydea", "Chydee", "Chydey", "Chydi", "Chydie", "Chydy", "Chyke", "Collins", "Dabiri", "Dagunduro", "Daniel", "Daramola", "Dare", "Darego", "Dauda", "David", "Diji", "Dike", "Dina", "Dingba", "Diogu", "Diya", "Domike", "Duncan", "Duru", "Ebele", "Ebor", "Echeruo", "Echinkunwoke", "Edet", "Edewor", "Edochie", "Edozie", "Effiong", "Egbeniyi", "Egbuson", "Egunjobi", "Ehizuelen", "Ejiofor", "Ejiro", "Eke", "Ekeh", "Ekeinde", "Ekene", "Ekenedilichukwu", "Ekpo", "Ekwensi", "Ekwueme", "Emecheta", "Emeka", "Emenanjo", "Emiola", "Emmanuel", "Enemkpali", "Enwezor", "Enwonwu", "Enyinnaya", "Erayokan", "Esogbue", "Essien", "Esua", "Esuene", "Etefia", "Etim", "Euba", "Eze", "Ezeh", "Ezekwesili", "Ezeogu", "Ezeugo", "Ezinwa", "Ezuruonye", "Fabiyi", "Faborede", "Faduma", "Fafunwa", "Fagbohun", "Fakeye", "Falola", "Faloye", "Falusi", "Familoni", "Famurewa", "Famuyiwa", "Fasasi", "Fasuba", "Fatinikun", "Fatiu", "Fatuga", "Fayemi", "Filani", "Francis", "Friday", "Fumnanya", "Gambari", "Garba", "Gbaja", "George", "Godwin", "Gowon", "Gunem", "Gwam", "Habe", "Halim", "Halimnye", "Hamajam", "Hassan", "Henshaw", "Hicks", "Ibadim", "Ibe", "Ibeabuchi", "Ibekwe", "Ibezimako", "Ibidapo", "Ibikunle", "Ibrahim", "Idehen", "Idiata", "Idowu", "Idris", "Ifeadi", "Ifeajuna", "Ifeanyichukwu", "Ifeatu", "Igbokwe", "Ige", "Igwe", "Iheme", "Ijeawele", "Ijeh", "Ijendu", "Ike", "Ikedieze", "Ikeji", "Ikem", "Ikenna", "Ikpeazu", "Ikpi", "Ikwuakor", "Imeh", "Imhoaperamhe", "Inyang", "Ipaye", "Isaac", "Isah", "Ishola", "Isola", "Isozoh", "Issac", "Itanyi", "Itodo", "Iweala", "Iweobiegbulam", "Iwundu", "Izuchukwu", "Jaja", "Jajah", "James", "Jamuike", "Jegede", "Jel", "Jelan", "Jelanea", "Jelanee", "Jelaney", "Jelani", "Jelanie", "Jelany", "Jideofor", "Jimoh", "Jioke", "John", "Johnson", "Jonathan", "Jones", "Joseph", "Joshua", "Junaidu", "Kabir", "Kalu", "Kaly", "Kanayo", "Kayode", "Kechere", "Kehinde", "Khumbanyiwa", "Kiaga", "Kolade", "Kolawole", "Koofrey", "Kumuyi", "Kuti", "Ladipo", "Lambo", "Lawal", "Mabogunje", "Madaki", "Madou", "Madu", "Maduabuchim", "Madubuike", "Madue", "Madukaife", "Madukwe", "Majekodunmo", "Makinde", "Manyika", "Martins", "Maude", "Mazi", "Mazzi", "Mba", "Mezu", "Michael", "Mimiko", "Mmeka", "Moemeka", "Mohammed", "Momoh", "Monye", "Moradeyo", "Moreno", "Morton", "Mosaku", "Moses", "Moweta", "Mozia", "Mozie", "Muhammad", "Muhammed", "Muhktar", "Munachiso", "Muoneke", "Musa", "Mustapha", "Ndibe", "Ndidi", "Nduka", "Ndukwe", "Ndulu", "Nelson", "Ngozi", "Njoku", "Njokuani", "Nkechi", "Nkemdilim", "Nnaji", "Nnamani", "Nnamdi", "Nsa", "Nsofor", "Nurudeen", "Nwabudike", "Nwachukwu", "Nwaise", "Nwanaga", "Nwankwo", "Nwapa", "Nweke", "Nwelue", "Nwoffiah", "Nwoko", "Nwosu", "Nwoye", "Nzekwu", "Obadike", "Obafunwa", "Obasea", "Obasee", "Obasey", "Obasi", "Obasie", "Obasy", "Obea", "Obee", "Obesere", "Obey", "Obi", "Obie", "Obielum", "Obike", "Obikwelu", "Obinna", "Obinwa", "Obiora", "Obisesan", "Obong", "Oby", "Obyke", "Ochuba", "Odeku", "Odion", "Odogwu", "Oduduru", "Odumegwu", "Odumosu", "Odutokun", "Oduwole", "Oduye", "Ofili", "Ogbonna", "Ogbonnia", "Ogbu", "Ogochukwu", "Ogoro", "Oguine", "Ogunbiyi", "Ogunde", "Ogundipe", "Ogunfiditimi", "Ogunkoya", "Ogunlesi", "Ogunleye", "Ogunmola", "Ogunnaike", "Ogunrinde", "Ogunsheye", "Ogwu", "Ogwumike", "Ohadugha", "Ohumotu", "Ojerinde", "Ojike", "Ojikutu", "Ojiudu", "Ojo", "Ojomo", "Ojopagogo", "Ojukwu", "Okafo", "Okafor", "Okagbare", "Okaome", "Oke", "Okeafor", "Okechukwu", "Okediji", "Okeke", "Okeli", "Okeniyi", "Okereke", "Okezie", "Oki", "Okigbo", "Okikiolu", "Okocha", "Okoh", "Okoli", "Okon", "Okonjo", "Okonkwo", "Okonma", "Okorafor", "Okore", "Okorie", "Okoro", "Okoroafor", "Okoye", "Okpara", "Okparaebo", "Okparo", "Okparra", "Okparro", "Okpuzu", "Okwara", "Okwei", "Okwelume", "Ola", "Oladapo", "Oladele", "Oladimeji", "Oladipo", "Oladipupo", "Oladopo", "Oladoye", "Olagundoye", "Olaiya", "Olajide", "Olajuwon", "Olaleye", "Olaniyan", "Olaniyi", "Olanrewaju", "Olarewaju", "Olaswere", "Olatunde", "Olatunji", "Olayiwola", "Olopade", "Olowora", "Oluanika", "Oluchi", "Olude", "Olukoju", "Olukotun", "Olumide", "Olupona", "Olusola", "Oluwafemi", "Omagbemi", "Omalu", "Omengboji", "Omenka", "Omenuko", "Omolade", "Omole", "Omolewa", "Omolola", "Omotola", "Omotoso", "Onabule", "Onatolu", "Onayemi", "Oni", "Onoh", "Onuchukwu", "Onuoha", "Onweagba", "Onwenu", "Ọnwụtalóbi", "Onyali", "Onyefulu", "Onyekachi", "Onyekachukwu", "Onyekwelu", "Onyekwene", "Onyewu", "Opara", "Opia", "Oriola", "Orjea", "Orjee", "Orjey", "Orji", "Orjie", "Orjy", "Oruche", "Osagie", "Osakalumi", "Osazuwa", "Osemele", "Oshinowo", "Oshoniyi", "Osinbajo", "Osofisan", "Osundare", "Osuntokun", "Osupa", "Otohwo", "Ovia", "Owoh", "Owolabi", "Oyedepo", "Oyediran", "Oyegunle", "Oyekan", "Oyelana", "Oyetoro", "Oyewole", "Oyewumi", "Ozioma", "Ozoemena", "Ozolua", "Paul", "Peter", "Peters", "Popoola", "Potts-Johnson", "Potts", "Raji", "Rumfa", "Sadiq", "Salako", "Salami", "Sambo", "Samson", "Samuel", "Sani", "Sanni", "Sanusi", "Sanya", "Shadare", "Shagari", "Shehu", "Shekoi", "Shittu", "Shonekan", "Simmons", "Smith", "Soboyejo", "Sodimu", "Sofola", "Sofolowe", "Solomon", "Somayina", "Sosimi", "Sotubo", "Sowande", "Soyinka", "Stephen", "Sulaiman", "Sule", "Suleiman", "Sunday", "Taiwo", "Temowo", "Tetuila", "Thomas", "Thompson", "Thorley", "Tijani", "Tobechukwu", "Torimiro", "Tubosun", "Ubogagu", "Uche", "Uchea", "Uchechea", "Uchechee", "Uchechey", "Uchechi", "Uchechie", "Uchechy", "Uchee", "Uchendu", "Uchey", "Uchi", "Uchie", "Uchy", "Udechukwu", "Udeg", "Udegbulam", "Udegbunam", "Udo", "Udoh", "Ugochukwu", "Ugonna", "Ugoorji", "Ugwu", "Ukpabio", "Umar", "Umeadi", "Umeh", "Umenyiora", "Umoh", "Umunna", "Unigwe", "Usman", "Utomi", "Utondu", "Uwaezuoke", "Uzochi", "Uzochukwu", "Uzoigwe", "Uzoma", "Victor", "Wall", "Wanogho", "Wey", "Williams", "Yahaya", "Yakubu", "Yekini", "Yobachukwu", "Yobanna", "Yusuf", "Zebenjo", "Zikoranaudodimma"]>>
 
 <<set setup.nigerienSlaveNames = ["Adélaïde", "Adèle", "Adrienne", "Agathe", "Agnès", "Aicha", "Aichatou", "Aïchatou", "Aile", "Aimée", "Aissa", "Aïssata", "Alaine", "Albane", "Alette", "Alexandra", "Alexanne", "Alexis", "Alice", "Aline", "Alix", "Alizée", "Altine", "Amalie", "Amandine", "Ambre", "Amée", "Amélie", "Amina", "Aminatou", "Aminatu", "Anabelle", "Anaëlle", "Anaïs", "Andréa", "Andréanne", "Andrée", "Andrie", "Ange", "Angélique", "Anissah", "Annabelle", "Annakiya", "Anne-Marie", "Anne-Sophie", "Anne", "Annette", "Annick", "Annie", "Antoinette", "Appoline", "Ariane", "Arielle", "Arlette", "Armelle", "Arziki", "Asabe", "Assibi", "Astérie", "Asura", "Aubine", "Audi", "Aurélie", "Aurore", "Auta", "Avril", "Axelle", "Ayesho", "Babette", "Balaraba", "Balkissa", "Barbe", "Batunya", "Béatrice", "Belle", "Bernadette", "Bernice", "Bertille", "Bien Aimée", "Blaisotte", "Blanche", "Blanchette", "Bluette", "Brigitte", "Calanthe", "Camille", "Capucine", "Carolane", "Carole", "Caroline", "Cassandre", "Catherine", "Cécilie", "Celeste", "Celia", "Célia", "Celine", "Céline", "Cerise", "Chanel", "Chantal", "Charline", "Charlotte", "Charmaine", "Cherie", "Cherifa", "Cherifatou", "Chloë", "Christelle", "Christiane", "Christine", "Claire-Marie", "Claire", "Clarisse", "Claude", "Claudette", "Claudie", "Claudine", "Clémence", "Clémentine", "Clervie", "Cloé", "Clothilde", "Clotilde", "Colette", "Coline", "Colombe", "Constance", "Coralie", "Cordélie", "Corentine", "Corinne", "Cornélie", "Cosette", "Crescence", "Danielle", "Daphné", "Daphnée", "Daura", "Delphine", "Delu", "Denise", "Desirée", "Dianne", "Dionne", "Dioura", "Dominique", "Doralice", "Doré", "Dorette", "Doriane", "Dorothée", "Égérie", "Elaine", "Éléanore", "Eléna", "Éliane", "Élisabeth", "Elise", "Élizabeth", "Élodie", "Eloise", "Emeline", "Émilie", "Émilienne", "Emmanuelle", "Emy", "Ernestine", "Esmé", "Estée", "Estelle", "Eugénie", "Eulalie", "Evangeline", "Eve", "Evelyne", "Fabienne", "Fanny", "Fantine", "Farida", "Faridatou", "Fatouma", "Fernande", "Fifi", "Fleur", "Florence", "Florie", "Francine", "Françoise", "Frédérique", "Gabrielle", "Gaddo", "Geneviève", "Georgette", "Georgine", "Germaine", "Gervaise", "Ghislaine", "Ginette", "Gisèle", "Grâce", "Gude", "Gumbo", "Hadiza", "Haissa", "Halima", "Halimata", "Halimatou", "Hanazullunni", "Haoua", "Hasana", "Hassia", "Hélène", "Héloïse", "Henriette", "Hermine", "Huseina", "Hyacinthe", "Inés", "Irène", "Iris", "Isabeau", "Isabelle", "Jacqueline", "Janine", "Jeand'arc", "Jeanette", "Jeanine", "Jeanne-Aimée", "Jeanne-Yvette", "Jeanne", "Jeannine", "Jenevieve", "Joëlle", "Jolène", "Josephine", "Josette", "Josiane", "Julie", "Juliette", "Jummai", "Justine", "Kaka", "Kande", "Karina", "Karine", "Koshi", "Ladi", "Laetitia", "Lailatou", "Lami", "Laminde", "Lantala", "Lantana", "Lanti", "Laraba", "Larai", "Laure", "Laurence", "Lauretu", "Lauriane", "Laurianne", "Laurie", "Laurine", "Léa", "Léonie", "Léonore", "Liane", "Lianne", "Liliane", "Lilianne", "Lise", "Lisette", "Lisha", "Loraine", "Loréline", "Lorraine", "Louise", "Lubabah", "Lucie", "Lucienne", "Lucile", "Lucille", "Lucrèce", "Ludivine", "Lydie", "Mabelle", "Madeleine", "Maelle", "Magalie", "Malika", "Manon", "Marcelle", "Margaux", "Margot", "Marguerite", "Mariama", "Marianne", "Marie-Anne", "Marie-Claire", "Marie-Claude", "Marie-Ève", "Marie-France", "Marie-Hélène", "Marie-Laure", "Marie-Louise", "Marie-Noelle", "Marie-Pier", "Marie-Pierre", "Marie-Sophie", "Marie-Sylvie", "Marie-Thérèse", "Marie", "Marielle", "Marine", "Marion", "Marjolaine", "Marka", "Marthe", "Martine", "Mathilde", "Maude", "Maxime", "Maxine", "Mégane", "Mélaine", "Mélanie", "Mélina", "Mélissa", "Mélodie", "Michèle", "Micheline", "Mignon", "Mimi", "Mirabelle", "Mireille", "Miriam", "Monafiki", "Monette", "Monique", "Morgane", "Mounkaïla", "Musette", "Mylène", "Myriam", "Nadège", "Nadine", "Nadja", "Nafissa", "Nafissatou", "Nagode", "Nanette", "Natalie", "Nathalie", "Nicole", "Nicolette", "Noelle", "Noemi", "Noémie", "Océane", "Odette", "Odile", "Ombeline", "Ophélie", "Orégane", "Oum", "Oumou", "Patrice", "Paulette", "Pauline", "Philippine", "Quitterie", "Rabo", "Rachelle", "Rachida", "Rachidatou", "Rahine", "Rakiatou", "Ramatoulaye", "Raymonde", "Renée", "Rita", "Rochelle", "Romaine", "Romane", "Rosalie", "Rose", "Rosine", "Roukaya", "Roxane", "Sabine", "Sabrine", "Salam", "Salamtou", "Salome", "Salomé", "Samia", "Samira", "Sandrine", "Sara", "Séraphine", "Shaïda", "Shatu", "Shetu", "Sidonie", "Simone", "Simonne", "Sixtine", "Solange", "Solène", "Solenne", "Sophie", "Stéphanie", "Suzanne", "Sylvie", "Talatu", "Tani", "Tanisha", "Tarana", "Thérèse", "Tiphaine", "Turunku", "Valentine", "Valérie", "Véronique", "Victoire", "Violette", "Virgie", "Virginie", "Vivienne", "Yahanatou", "Yalwa", "Yannick", "Yar Arziki", "Yar Jekada", "Yvette", "Yvonne", "Zaila", "Zamangirra", "Zoë"]>>
 <<set setup.nigerienMaleNames = ["Abashe", "Abdou", "Abdoulaye", "Abdoulaziz", "Achille", "Adam", "Adamou", "Adamu", "Adrien", "Aïdan", "Ailou", "Ajuji", "Alain-René", "Alain", "Albadé", "Alban", "Albert", "Alexandre", "Alexis", "Ali", "Aloïs", "Alphonse", "Amadou", "Amaury", "Ambroise", "Amédée", "Aminu", "Anatole", "André", "Anicet", "Anselme", "Antoine", "Aristide", "Armand", "Arnaud", "Arsène", "Arthur", "Aubert", "Aubin", "Audefroy", "Auguste", "Augustin", "Aurélien", "Auta", "Aymeric", "Bakano", "Balarabe", "Baptiste", "Bardiou", "Barmani", "Barthélémy", "Basile", "Bastien", "Baudier", "Baudouin", "Beau", "Benjamin", "Benoît", "Bérenger", "Bernard", "Bertrand", "BiSalla", "Blaise", "Boudreaux", "Boukary", "Brice", "Brieux", "Brigi", "Bruno", "Cécil", "Cédric", "Cédrick", "Céléstin", "César", "Chaibou", "Charles Étienne", "Charles-Antoine", "Charles", "Chrétien", "Christophe", "Ciwake", "Clair", "Claude", "Clément", "Clovis", "Côme", "Constantin", "Corentin", "Cyprien", "Cyriaque", "Cyrille", "Damien", "Dan Kano", "Dan More", "Danasabe", "Danick", "Daniel", "Danjuma", "Danladi", "Danlami", "Dantala", "Dany", "Daouda", "Daren Tuwo", "Daren", "Dartagnan", "David", "Dédé", "Denis", "Déreck", "Didier", "Dikko", "Dogo", "Dogon Jokado", "Dominique", "Donatien", "Duka", "Edmond", "Édouard", "Égide", "Élias", "Élie", "Éliot", "Éloi", "Émerick", "Emeril", "Émile", "Émilien", "Emmanuel", "Enrick", "Éric", "Esmé", "Étienne", "Eugène", "Evarist", "Évrard", "Fabien", "Fabrice", "Faust", "Félix Antoine", "Félix", "Fernand", "Fidèle", "Firmin", "Flavien", "Florent", "Florian", "Fodio", "Franck", "François", "Frédéric", "Frédérick", "Gabin", "Gabriel", "Gaddo", "Gaël", "Gaétan", "Gaëtan", "Galadima", "Gaspard", "Gaston", "Gatien", "Gauthier", "Gautier", "Gédéon", "Geoffroy", "George-Marie", "Georges", "Gérard", "Germain", "Ghislain", "Gilbert", "Giles", "Gilles", "Giraud", "Grégoire", "Guillaume", "Gustave", "Guy", "Hama", "Hamani", "Hamid", "Harouna", "Hassan", "Hassia", "Henri", "Hervé", "Hilaire", "Honoré", "Hubert", "Hugo", "Hugues", "Husayn", "Husseini", "Ibrahim", "Idrissa", "Iggi", "Ignace", "Inni", "Irène", "Isidore", "Ismaël", "Issa", "Jacques-Yves", "Jacques", "Jacquot", "Jakada", "Jean-Albert", "Jean-André", "Jean-Baptise", "Jean-Christophe", "Jean-Claude", "Jean-Didier", "Jean-France", "Jean-François", "Jean-Guy", "Jean-Jacques", "Jean-Jérôme", "Jean-Lou", "Jean-Louis", "Jean-Luc", "Jean-Marc", "Jean-Marie", "Jean-Michel", "Jean-Paul", "Jean-Philippe", "Jean-Pierre", "Jean-René", "Jean-Sébastien", "Jean-Simon", "Jean-Xavier", "Jean-Yves", "Jean", "Jérémi", "Jérémie", "Jérémy", "Jermaine", "Jérôme", "Jessy", "Jirgi", "Joël", "Jojo", "Joscelin", "Joseph-Benoît", "Joseph", "Jourdain", "Juji", "Jules", "Julien", "Juste", "Justin", "Lahidi", "Laraba", "Laurent", "Lawali", "Lazare", "Léandre", "Léo", "Léon", "Léonard", "Léopold", "Lilian", "Loïc", "Lou", "Louis Philippe", "Louis-Charles", "Louis-Joseph", "Louis", "Louka", "Luc", "Lucas", "Lucien", "Ludovic", "Macaire", "Maël", "Mahamadou", "Mahamane", "Mai Zaria", "Mamadou", "Mamane", "Marc André", "Marc Antoine", "Marc Olivier", "Marc-Alexandre", "Marc-André", "Marc-Antoine", "Marc-Henri", "Marc", "Marcel", "Marcellin", "Martin", "Mathias", "Mathieu", "Mathis", "Mattéo", "Matthieu", "Maurice", "Maxence", "Maxime", "Maximilien", "Michel", "Mickaël", "Moumouni", "Moussa", "Narcisse", "Nasser", "Nicéphore", "Nicolas", "Noé", "Noël", "Noma", "Nordine", "Octavien", "Odilon", "Olivier", "Oumarou", "Pascal", "Patrice", "Paul", "Philippe", "Pier-Olivier", "Pierre Alexandre", "Pierre Olivier", "Pierre-Luc", "Pierre", "Pierrick", "Pierrot", "Prosper", "Quentin", "Rabo", "Rafaël", "Raoul", "Raphaël", "Rayan", "Raymond", "Réal", "Régis", "Réjean", "Rémi", "Rémy", "Renald", "Renaud", "René", "Richard", "Risku", "Robert", "Rodolphe", "Rodrigue", "Roger", "Roland", "Romain", "Romaine", "Salou", "Samuel", "Samy", "Sébastien", "Serge", "Séverin", "Seyni", "Shaba", "Shekarau", "Shuka", "Simeon", "Simon Olivier", "Smaël", "Sofiane", "Souley", "Stanislas", "Stefan-André", "Stephan", "Stéphane", "Sulpice", "Sylvain", "Sylvestre", "Talatu", "Tancrede", "Tanimu", "Tanko", "Tatau", "Tatu", "Théo", "Théodore", "Théophile", "Thibaud", "Thibault", "Thibaut", "Thierry", "Thomas", "Timothé", "Timothée", "Toussaint", "Valentin", "Valère", "Victor", "Vincent", "Virgile", "Xavier", "Yacouba", "Yakubu", "Yalwa", "Yan", "Yanick", "Yanis", "Yaro", "Yoan", "Yohan", "Yohance", "Yves", "Yvon", "Zacharie", "Zaki", "Zephrin", "Zinnedine"]>>
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index d442e6db74f4fe1723ecb3929a0e182269064cfe..729de669a662fc81d02e2cf5c459f1290322b959 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -27,16 +27,11 @@
 		<<set $PC.clothes = "a nice maid outfit">>
 		<<set $PC.intelligenceImplant = 0>>
 	<</if>>
-<<<<<<< HEAD
-	<<if $PC.vagina >= 1>>
-		<<set $PC.births = 0>>
-=======
 	<<if $PC.vagina == -1>>
 		<<set $PC.ovaries = 0>>
 	<<elseif $PC.vagina > 0>>
 		<<set $PC.vaginaLube = 1>>
 		<<set $PC.counter.birthsTotal = 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<if $PC.career == "servant">>
 			<<if $PC.pregType != 8>>
 				<<if $PC.actualAge >= 50>>
diff --git a/src/npc/descriptions/fAssistedSex.tw b/src/npc/descriptions/fAssistedSex.tw
index 8d0202ecd54659928f0128412535785a25586551..e66828ebb2636e22619631d23bfe1abb6ed6237d 100644
--- a/src/npc/descriptions/fAssistedSex.tw
+++ b/src/npc/descriptions/fAssistedSex.tw
@@ -43,11 +43,7 @@ You order $his servants forward so that $he can tease you with $his enormously s
 	$He tenses in a moment of instinctive resistance, then surrenders $his body to $his aids' total control, clearly afraid of punishment.
 <</if>>
 You remove your clothes and lie back on the office couch,
-<<<<<<< HEAD
-<<if $PC.dick >= 1>>
-=======
 <<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	allowing your exposed, full-mast dick to loll in front of you.
 <<else>>
 	spreading your exposed, oozing twat.
@@ -60,11 +56,7 @@ You remove your clothes and lie back on the office couch,
 	Smiling fakely,
 <</if>>
 $he draws toward you, half-floating on a river of silent, groping hands. When $he is mere <<if $showInches == 2>>inches<<else>>centimeters<</if>> away from you, $his servants lift $him higher, and $he
-<<<<<<< HEAD
-<<if $PC.dick >= 1>>
-=======
 <<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	teases your dick with a series of masterful — and carefully balanced — belly isolations, rubbing the thick nub of $his belly button in small semicircles around your oozing cockhead as $he does so. Right when you feel ready to explode, $he rotates around, bringing
 	<<if $activeSlave.butt > 11>>
 		$his overgrown, wobbling ass cheeks
diff --git a/src/npc/descriptions/fBoobs.tw b/src/npc/descriptions/fBoobs.tw
index 9f4d4e7493185ad8a2712a26c3c2562d6fda4402..56becd4fe9ecba2f43c1dc88f38cecc107386e87 100644
--- a/src/npc/descriptions/fBoobs.tw
+++ b/src/npc/descriptions/fBoobs.tw
@@ -112,15 +112,9 @@ tits.
 		You set $his massively distended body on the floor, and tease $him for a while until $his nipples are rock hard. This done, you kneel down on $him with each of your legs aside $his torso, rear against the top of $his belly, and hump your pussy back and forth on the stiff nub of one nipple. $He lies there, desperately trying to reach around $his bulk to $his own pussy, but unable to do so, resorts to squirming with the stimulation.
 	<</if>>
 <<elseif tooBigBreasts($activeSlave)>>
-<<<<<<< HEAD
-	<<if $PC.dick >= 1>>
-		$His excessive breasts make $him a unique appliance for mammary intercourse. You lay $him down on the ground on $his back, lube $his cleavage, and straddle $his torso. $He holds $his udders together, creating a warm, wet channel as fuckable as any hole. You blast $him in the face with your cum in no time<<if $PC.vagina >= 1>>, leaving your pussyjuice on $his chest where you rubbed against $him<</if>>.
-	<<elseif $PC.boobs != 0>>
-=======
 	<<if $PC.dick != 0>>
 		$His excessive breasts make $him a unique appliance for mammary intercourse. You lay $him down on the ground on $his back, lube $his cleavage, and straddle $his torso. $He holds $his udders together, creating a warm, wet channel as fuckable as any hole. You blast $him in the face with your cum in no time<<if $PC.vagina != -1>>, leaving your pussyjuice on $his chest where you rubbed against $him<</if>>.
 	<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		You lie down on top of $him, face to face, so that your much smaller breasts press into the massive pillows formed by $his chest. Scooting around to stimulate your nipples against $his warm breastflesh, you kiss the slave while pushing a hand down between you to schlick yourself against $him.
 	<<else>>
 		You set $his nearly helpless body on the floor and then scoot your hips under the massive weight of $his tits. The heft feels nice against you, and you worm a naughty hand under there to play with yourself in the warm cave formed by your pelvis and $his udders.
diff --git a/src/npc/descriptions/fFuckdollWidgets.tw b/src/npc/descriptions/fFuckdollWidgets.tw
index 92c0b84370ec9c6c2ec7b65337dc192ec6529c2a..9fe813675ef3124584df716fe6af108d49b0450e 100644
--- a/src/npc/descriptions/fFuckdollWidgets.tw
+++ b/src/npc/descriptions/fFuckdollWidgets.tw
@@ -54,11 +54,7 @@ You decide to use the Fuckdoll's <<if $activeSlave.vagina > 3>>cavernous<<elseif
 <<elseif $activeSlave.fuckdoll <= 40>>
 	Aware that $he is supposed to relax and accept rape, $he does $his best to let you take $him without resistance.
 <<else>>
-<<<<<<< HEAD
-	You command $him to milk your <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> with $his vaginal walls, and $he obediently starts to flex $his well-developed cunt muscles, squeezing <<if $PC.dick >= 1>>you<<else>>your strap-on<</if>> from base to tip.
-=======
 	You command $him to milk your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> with $his vaginal walls, and $he obediently starts to flex $his well-developed cunt muscles, squeezing <<if $PC.dick != 0>>you<<else>>your strap-on<</if>> from base to tip.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 <</if>>
 <<if $activeSlave.fuckdoll <= 60>>
 	<<if $activeSlave.energy > 40>>Denied any other outlet for $his healthy sex drive, $he orgasms.<</if>>
@@ -70,13 +66,8 @@ You decide to use the Fuckdoll's <<if $activeSlave.vagina > 3>>cavernous<<elseif
 <<else>>
 	$He moans, <<if $activeSlave.lips > 95>>and the lips of $his facepussy quiver<<else>>struggling to force the sound past $his mouth insert<</if>>.
 <</if>>
-<<<<<<< HEAD
-You climax<<if $PC.dick >= 1>>, your cum shooting forward to splash against $his womb,<</if>> and return $him to <<if hasAnyLegs($activeSlave)>>a standing position<<else>>where $he was resting<</if>>.
-<<if $PC.dick >= 1>>
-=======
 You climax<<if $PC.dick != 0>>, your cum shooting forward to splash against $his womb,<</if>> and return $him to <<if hasAnyLegs($activeSlave)>>a standing position<<else>>where $he was resting<</if>>.
 <<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<if $activeSlave.vagina > 2>>Your cum flows out of $his gaping front hole and down the material of $his suit.
 	<<elseif $activeSlave.vagina == 2>>Your cum drips out of $his well-fucked front hole and down the material of $his suit.
 	<<else>>$His tight front hole retains almost every drop of your cum. A few escape and run down the material of $his suit.
@@ -115,11 +106,7 @@ You climax<<if $PC.dick != 0>>, your cum shooting forward to splash against $his
 
 You decide to use the Fuckdoll's fertile womb to grow a child.
 <<if $activeSlave.fuckdoll <= 10>>
-<<<<<<< HEAD
-	Since $he is not well adapted to life as a living sex toy yet, $he won't respond to position commands. So, you simply <<if hasAnyLegs($activeSlave)>>push $him down to lie on the couch<<else>>set $him on your desk<</if>> and shove <<if $PC.dick >= 1>>your cock<<else>>a strap-on<</if>> inside $his <<if $activeSlave.mpreg == 1>>asshole<<else>>vagina<</if>>.
-=======
 	Since $he is not well adapted to life as a living sex toy yet, $he won't respond to position commands. So, you simply <<if hasAnyLegs($activeSlave)>>push $him down to lie on the couch<<else>>set $him on your desk<</if>> and shove <<if $PC.dick != 0>>your cock<<else>>a strap-on<</if>> inside $his <<if $activeSlave.mpreg == 1>>asshole<<else>>vagina<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 <<elseif $activeSlave.fuckdoll <= 70>>
 	$He can follow intermediate commands, so you order $him into a position for use of $his <<if $activeSlave.mpreg == 1>>rear<<else>>front<</if>> hole. $He obediently <<if hasAllLimbs($activeSlave)>>gets down on all fours and <</if>>cocks $his hips, offering $his <<if $activeSlave.mpreg == 1>>asspussy<<else>>cunt<</if>> until you insert your cock into $his <<if $activeSlave.mpreg == 1>>winking<<else>>wet<</if>> channel.
 <<else>>
diff --git a/src/npc/descriptions/fPoolSex.tw b/src/npc/descriptions/fPoolSex.tw
index 43fb7121a3e75b55e3b09fc53af6d0acab2803f5..d1bd5adee80c339b1e7676859c368539cb9003b9 100644
--- a/src/npc/descriptions/fPoolSex.tw
+++ b/src/npc/descriptions/fPoolSex.tw
@@ -77,11 +77,7 @@ You order $him to meet you in the spa for some quality time in the penthouse's r
 	<<else>>
 		wobbles back and forth, ineffectually trying to fight back as you cover $him in thick wads of gel, over and over. After several minutes of this, you decide that your
 	<</if>>
-<<<<<<< HEAD
-	<<if $PC.dick >= 1>>
-=======
 	<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		solid, quivering erection is in need of $his tender care. <<if canSee($activeSlave)>>Seeing<<else>>Sensing<</if>> the change in your demeanor, $he rolls back to recline at the pool's edge and, once you've joined $him,
 		<<if hasAnyArms($activeSlave)>>
 			reaches down to masturbate your ooze lubricated dick.
@@ -135,11 +131,7 @@ You order $him to meet you in the spa for some quality time in the penthouse's r
 	you strip down and change into your swimming outfit. When you're ready to join $him, you motion at the pool's holographic console and its mobility assistance devices kick in, rolling $him into the curative gel. You sink yourself into the pool, taking a moment to bask in the feeling of the warm, curative laced goo as it relaxes your muscles<<if $PC.preg > 30>> and soothes your stretched skin<</if>>, then wade toward your worried looking slave.
 	<br><br>
 	$He smiles politely, rubbing circles in the exploded sides of $his colossal belly, then cries out in surprise as you take a handful of the ooze and shove it right in $his face. $He sputters, blushing, and wobbles back and forth, clearly trying not to react as you cover $him in thick wads of gel, over and over. After several minutes of this, you decide that your
-<<<<<<< HEAD
-	<<if $PC.dick >= 1>>
-=======
 	<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		solid, quivering erection is in need of $his tender care. You force $him back into a reclining position at the pool's edge and order $him to
 		<<if hasAnyArms($activeSlave)>>
 			masturbate your ooze lubricated dick.
diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw
index 89008105c834cbe8842b4082eead235d94c96352..e093e08997158bdd778c88fe5e1221c65ac4741a 100644
--- a/src/npc/descriptions/fVagina.tw
+++ b/src/npc/descriptions/fVagina.tw
@@ -254,11 +254,6 @@ You call $him over so you can
 				$his breasts press against your own average breasts;
 			<<elseif $PC.boobs >= 300>>
 				$his breasts press against your own small breasts;
-<<<<<<< HEAD
-			<<elseif $PC.boobs >= 1>>
-				$his breasts press against your own generous breasts;
-=======
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<elseif $PC.title == 0>>
 				$his breasts press against your flat breasts;
 			<<else>>
@@ -359,11 +354,7 @@ You call $him over so you can
 		<<elseif ($activeSlave.dick != 0)>>
 			$He bites $his lip and moans as $he climaxes. You fill $his squeezing fuckhole with your cum. $He already blew $his own load all over $his stomach despite $his inability to get hard.
 		<</if>>
-<<<<<<< HEAD
-		<<if $PC.vagina >= 1>>
-=======
 		<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			You got so wet fucking $him that when you climax, you stand up and let $him clean your pussy with $his mouth. The oral attention brings you to a quick aftershock orgasm.
 			<<set $activeSlave.counter.oral += 1>>
 			<<set $oralTotal += 1>>
@@ -473,11 +464,7 @@ You call $him over so you can
 		<<elseif ($activeSlave.clit > 2)>>
 			As you fuck $him, $he plays with $his huge clit. It's so large it almost looks like $he's jacking off a cock.
 		<</if>>
-<<<<<<< HEAD
-		<<if $PC.vagina >= 1>>
-=======
 		<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			You got so wet fucking $him that when you climax, you stand up; $he knows what that means, and hurries to eat you out. The oral attention brings you to a quick aftershock orgasm.
 			<<set $activeSlave.counter.oral += 1>>
 			<<set $oralTotal += 1>>
diff --git a/src/npc/fAbuse.tw b/src/npc/fAbuse.tw
index b0566abc7ea2be0664695adc744e146b5524acb1..e298e324c1ebfb4e66741d7c28d38f62bedce507 100644
--- a/src/npc/fAbuse.tw
+++ b/src/npc/fAbuse.tw
@@ -318,13 +318,8 @@
 	The slap seems to have excited $him, seeing $his hard nipples and wet pussy, and $his eyes practically beg for more.
 <</if>>
 
-<<<<<<< HEAD
-<<if ($PC.dick >= 1)>>
-	<<if hasAnyArms($activeSlave) && ($activeSlave.clothes !== "no clothing")>>While $he strips, your<<else>>Your<</if>> stiffening cock rises<<if $PC.vagina >= 1>>, revealing your pussy and<</if>> earning
-=======
 <<if ($PC.dick != 0)>>
 	<<if hasAnyArms($activeSlave) && ($activeSlave.clothes !== "no clothing")>>While $he strips, your<<else>>Your<</if>> stiffening cock rises<<if $PC.vagina != -1>>, revealing your pussy and<</if>> earning
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 <<else>>
 	<<if hasAnyArms($activeSlave) && ($activeSlave.clothes !== "no clothing")>>While $he strips, you<<else>>You<</if>> don a cruelly large strap-on, earning
 <</if>>
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index ea6f9441dcc2a5b75110da8be74744950f9dfee1..91fe9a79263dcbe4a195501d39a122efa6c0130f 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -113,11 +113,7 @@
 		<<case "masochist">>
 			I love it when you hurt me.
 		<<case "cumslut">>
-<<<<<<< HEAD
-			I love <<if $PC.dick != 0>><<s>>ucking on your cock<<if $PC.vagina >= 1>> and eating you out<</if>>.<<else>>eating you out.<</if>>
-=======
 			I love <<if $PC.dick != 0>><<s>>ucking on your cock<<if $PC.vagina != -1>> and eating you out<</if>>.<<else>>eating you out.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<case "humiliation">>
 			I love it when you u<<s>>e me in public.
 		<<case "buttslut">>
@@ -522,11 +518,7 @@ My favorite part of my body i<<s>>
 				<<case "sadist">>
 					I'm <<s>>o horny, <<Master>>. I can't <<s>>top thinking about the other <<s>>lave<<s>>, how it would feel to hurt them.
 				<<case "cumslut">>
-<<<<<<< HEAD
-					I'm <<s>>o horny, <<Master>>. I can't <<s>>top <<s>>taring at <<if $PC.dick >= 1>>cock<<s>> and imagining them down my throat, cumming and cumming<<else>>pu<<ss>>ie<<s>> and imagining how their jui<<c>>e<<s>> ta<<s>>te<</if>>.
-=======
 					I'm <<s>>o horny, <<Master>>. I can't <<s>>top <<s>>taring at <<if $PC.dick != 0>>cock<<s>> and imagining them down my throat, cumming and cumming<<else>>pu<<ss>>ie<<s>> and imagining how their jui<<c>>e<<s>> ta<<s>>te<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<case "buttslut">>
 					I'm <<s>>o horny, <<Master>>.
 					<<if (["long plug", "plug"].includes($activeSlave.buttplug) && $activeSlave.anus > 2) >>
diff --git a/src/npc/fRelation.tw b/src/npc/fRelation.tw
index ddaa7ad2108d09c039c8cc5b1624b05402735bb8..64c8b45022da3193d2dd7195e0a7c1d12a5aed96 100644
--- a/src/npc/fRelation.tw
+++ b/src/npc/fRelation.tw
@@ -52,11 +52,7 @@
 
 You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your office.
 
-<<<<<<< HEAD
-<<if canWalk($activeSlave) && canWalk($slaves[$partner]) && ($activeSlave.devotion > 50) && ($slaves[$partner].devotion > 50) && canPenetrate($activeSlave) && canPenetrate($slaves[$partner]) && ($slaves[$partner].anus > 0) && ($activeSlave.anus > 0) && ($PC.dick >= 1)>>
-=======
 <<if canWalk($activeSlave) && canWalk($slaves[$partner]) && ($activeSlave.devotion > 50) && ($slaves[$partner].devotion > 50) && canPenetrate($activeSlave) && canPenetrate($slaves[$partner]) && ($slaves[$partner].anus > 0) && ($activeSlave.anus > 0) && ($PC.dick != 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	There are three stiff pricks available. Since $activeSlave.slaveName was already in your office, $he goes on the bottom. $He lies on the floor, spreads $his <<if $seeRace == 1>>$activeSlave.race <</if>>buttocks, relaxes $his anus, and then begs $his _partnerRel to buttfuck $him. $slaves[$partner].slaveName does, slipping _his2 cock into _his2 _activeSlaveRel's ass. _He2 then stops and waits for you to buttfuck _him2 in turn. It isn't a particularly convenient way to fuck, but it's got the virtue of being uncommon. $slaves[$partner].slaveName, both fucking and getting fucked, comes in _his2 _activeSlaveRel's rectum first. They switch places so $activeSlave.slaveName can have a turn in the middle, leaving you to finish into $activeSlave.slaveName's already cum-soaked hole.
 	<<set $activeSlave.counter.anal += 2, $activeSlave.counter.penetrative++, $slaves[$partner].counter.anal += 2, $slaves[$partner].counter.penetrative++, $analTotal += 4, $penetrativeTotal += 2>>
 <<elseif ($slaves[$partner].devotion - $activeSlave.devotion > 20) && ($slaves[$partner].devotion <= 50)>>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 795a969780ea78fb01664f2cb351aecd14c01f26..fe0be4eb769be113a222cb03d074d8565519a003 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -2,11 +2,7 @@
 
 <<if $showStartingGirlsExplanation == 1>>
 	You're no stranger to the Free Cities, which means you're no stranger to slavery. If you wish, you can bring slaves from your past life with you to your arcology. You have <<print cashFormat($cash)>>; you can spend it on slaves here, or bring it with you to start the game. Slaves created here will be much cheaper than if they were purchased on the market.
-<<<<<<< HEAD
-	<<if ($PC.dick >= 1) && ($PC.vagina >= 1) && ($seeDicks != 0 || $makeDicks == 1)>>
-=======
 	<<if ($PC.dick != 0) && ($PC.vagina != -1) && ($seeDicks != 0 || $makeDicks == 1)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		Since you have both a penis and a vagina yourself, you've obviously had access to a source of advanced surgery and organ farming. @@.springgreen;Slaves get a smaller cost increase here for having both penises and vaginas, and for having both testicles and ovaries.@@
 	<</if>>
 	<<if $PC.career == "slaver">>
@@ -286,11 +282,7 @@ __You are customizing this slave:__
 		<<elseif $activeSlave.father == -1>>
 			<<set $activeSlave.origin = "$He was another of your late Master's servants. Your Master permitted you to knock up $his mother.">>
 			<<set $activeSlave.custom.tattoo = "$He has your Master's brand on $his left breast.">>
-<<<<<<< HEAD
-		<<elseif $PC.vagina >= 1>>
-=======
 		<<elseif $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<set $activeSlave.origin = "$He was another of your late Master's servants. $He helped you give birth to his child.">>
 			<<set $activeSlave.custom.tattoo = "$He has your Master's brand on $his left breast.">>
 		<<else>>
diff --git a/src/player/pcSurgeryDegradation.tw b/src/player/pcSurgeryDegradation.tw
index b206277ddc4731514c37ffc8f41166118e897f1a..48515a7cec732f3750606cb5587e1fdf74cbb0e2 100644
--- a/src/player/pcSurgeryDegradation.tw
+++ b/src/player/pcSurgeryDegradation.tw
@@ -24,24 +24,6 @@
 	<<PCAgeImplantAdjustmentUp>>
 
 <<case "breastReductionImplant">>
-<<<<<<< HEAD:src/pregmod/pcSurgeryDegradation.tw
-	After a few hours, you awaken in the recovery wing with a sore chest. <<if $PC.belly >= 10000>>Struggling to sit<<else>>Sitting<</if>> up, you immediately notice how much lighter your breasts are. Pulling the covers off yourself, you observe your implant free boobs in the mirror-covered wall across from your bed. "So do you like them?", asks the surgeon's assistant, seating _himselfU behind you and wrapping _hisU hands around to your natural breasts. "We made sure to tighten them up a bit, get rid of that sag from not having the silicone pouch in them anymore." _HeU begins groping your breasts, feeling for any oddities. "I know you're still a little sore, but bear with it." _HeU moves on to your nipples and begins teasing them. <<if $PC.lactation > 0>>_HeU lets out a surprised squeak when a gush of milk escapes your breasts and a moan escapes your lips. "<<if $PC.pregKnown == 1>>Should have expected that with the pregnancy and all.<<else>>You did recently have a child didn't you? Or have you just been enjoying your nipples too much?<</if>> Either way, this is a good thing. Your breasts work."<</if>> You can't help but moan under your building arousal as _heU massages and teases your breasts. "Enjoying yourself are we? Let me finish you off." _HeU sneaks a hand down to your <<if $PC.dick >= 1>>stiff prick and begins stroking its length, quickly bringing you to orgasm and relieving you of your built up tension.<<else>>stiff clit and begins teasing it as well, quickly bringing you to orgasm and relieving you of your built up tension.<</if>> _HeU states, while licking _hisU fingers, "I always did enjoy the way you taste. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
-
-<<case "breastShrinkage">>
-	After a few hours, you awaken in the recovery wing with a sore chest. <<if $PC.belly >= 10000>>Struggling to sit<<else>>Sitting<</if>> up, you immediately notice how much lighter your breasts are. Pulling the covers off yourself, you observe your smaller <<if $PC.boobsBonus == 2>>G-cup<<elseif $PC.boobsBonus == 1>>F-cup<<elseif $PC.boobsBonus == -1>>D-cup<<elseif $PC.boobsBonus == -2>>C-cup<<elseif $PC.boobsBonus == -3>>B-cup<<else>>DD-cup<</if>> boobs in the mirror-covered wall across from your bed. "So do you like them?", asks the surgeon's assistant, seating _himselfU behind you and wrapping _hisU hands around to your shrunken breasts. "We made sure to tighten them up a bit, get rid of that sagginess from weight and the mass removed." _HeU begins groping your breasts, feeling for any oddities. "I know you're still a little sore, but bear with it." _HeU moves on to your nipples and begins teasing them. <<if $PC.lactation > 0>>_HeU lets out a surprised squeak when a gush of milk escapes your breasts and a moan escapes your lips. "<<if $PC.pregKnown == 1>>Should have expected that with the pregnancy and all.<<else>>You did recently have a child didn't you? Or have you just been enjoying your nipples too much?<</if>> Either way, this is a good thing. Your breasts work."<</if>> You can't help but moan under your building arousal as _heU massages and teases your breasts. "Enjoying yourself are we? Let me finish you off." _HeU sneaks a hand down to your <<if $PC.dick >= 1>>stiff prick and begins stroking its length, quickly bringing you to orgasm and relieving you of your built up tension.<<else>>stiff clit and begins teasing it as well, quickly bringing you to orgasm and relieving you of your built up tension.<</if>> _HeU states, while licking _hisU fingers, "I always did enjoy the way you taste. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
-
-<<case "breastEnlargementImplant">>
-	After a few hours, you awaken in the recovery wing with a sore chest. <<if $PC.belly >= 10000 || $PC.boobsBonus == 3>>Struggling to sit<<else>>Sitting<</if>> up, you immediately notice how much heavier your breasts are. Pulling the covers off yourself, you observe your new, round <<if $PC.boobsBonus == 2>>G-cup<<elseif $PC.boobsBonus == 1>>F-cup<<else>>H-cup<</if>> boobs in the mirror-covered wall across from your bed. "So do you like them?", asks the surgeon's assistant, seating _himselfU behind you and wrapping _hisU hands around to your heaving breasts. "We did everything we could to keep them looking natural, <<if $PC.boobsBonus == 2>>but you can definitely tell<<elseif $PC.boobsBonus == 1>>and I say we did a pretty good job<<else>>but the implants were way too big for that<</if>>." _HeU begins groping your breasts, feeling the implant within for any oddities. "I know you're still a little sore, but bear with it." _HeU moves on to your nipples and begins teasing them. <<if $PC.lactation > 0>>_HeU lets out a surprised squeak when a gush of milk escapes your breasts and a moan escapes your lips. "<<if $PC.pregKnown == 1>>Should have expected that with the pregnancy and all.<<else>>You did recently have a child didn't you? Or have you just been enjoying your nipples too much?<</if>> Either way, this is a good thing. Your breasts work."<</if>> You can't help but moan under your building arousal as _heU massages and teases your implant laden breasts. "Enjoying yourself are we? Let me finish you off." _HeU sneaks a hand down to your <<if $PC.dick >= 1>>stiff prick and begins stroking its length, quickly bringing you to orgasm and relieving you of your built up tension.<<else>>stiff clit and begins teasing it as well, quickly bringing you to orgasm and relieving you of your built up tension.<</if>> _HeU states, while licking _hisU fingers, "I always did enjoy the way you taste. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
-
-<<case "breastEnlargement">>
-	After a few hours, you awaken in the recovery wing with a sore chest. <<if $PC.belly >= 10000 || $PC.boobsBonus == 3>>Struggling to sit<<else>>Sitting<</if>> up, you immediately notice how much heavier your breasts are. Pulling the covers off yourself, you observe your new, soft <<if $PC.boobsBonus >= 3>>H-cup<<elseif $PC.boobsBonus == 2>>G-cup<<elseif $PC.boobsBonus == 1>>F-cup<<elseif $PC.boobsBonus == -1>>D-cup<<elseif $PC.boobsBonus == -2>>C-cup<<elseif $PC.boobsBonus == -3>>B-cup<<else>>DD-cup<</if>> boobs in the mirror-covered wall across from your bed. "So do you like them?", asks the surgeon's assistant, seating _himselfU behind you and wrapping _hisU hands around to your heaving breasts. "We did everything we could to keep them perky, <<if $PC.boobsBonus >= 3>>quite a feat given their size<<else>>not that hard given your natural perk<</if>>." _HeU begins groping your breasts, feeling the added mass for any oddities. "I know you're still a little sore, but bear with it." _HeU moves on to your nipples and begins teasing them. <<if $PC.lactation > 0>>_HeU lets out a surprised squeak when a gush of milk escapes your breasts and a moan escapes your lips. "<<if $PC.pregKnown == 1>>Should have expected that with the pregnancy and all.<<else>>You did recently have a child didn't you? Or have you just been enjoying your nipples too much?<</if>> Either way, this is a good thing. Your breasts work."<</if>> You can't help but moan under your building arousal as _heU massages and teases your fat tits. "Enjoying yourself are we? Let me finish you off." _HeU sneaks a hand down to your <<if $PC.dick >= 1>>stiff prick and begins stroking its length, quickly bringing you to orgasm and relieving you of your built up tension.<<else>>stiff clit and begins teasing it as well, quickly bringing you to orgasm and relieving you of your built up tension.<</if>> _HeU states, while licking _hisU fingers, "I always did enjoy the way you taste. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
-
-<<case "flatChest">>
-	After a few hours, you awaken in the recovery wing with a sore chest. <<if $PC.belly >= 10000>>Struggling to sit<<else>>Sitting<</if>> up, you immediately notice the absence of the usual weight on your chest. Pulling the covers off yourself, you observe your flat chest in the mirror-covered wall across from your bed. "So do you like it?", asks the surgeon's assistant, seating _himselfU behind you and wrapping _hisU hands around to your chest. "I honestly couldn't live without my pair." _HeU begins groping your chest, feeling for any oddities. "I know you're still a little sore, but bear with it." _HeU moves on to your nipples and begins teasing them. <<if $PC.lactation > 0>>_HeU lets out a surprised squeak when a gush of milk escapes your tits and a moan escapes your lips. "<<if $PC.pregKnown == 1>>Should have expected that with the pregnancy and all.<<else>>You did recently have a child didn't you? Or have you just been enjoying your nipples too much?<</if>> Either way, this is a good thing. Your breasts still work, but it's still strange coming from such a flat chest."<</if>> You can't help but moan under your building arousal as _heU massages and teases your nipples. "Enjoying yourself are we? Let me finish you off." _HeU sneaks a hand down to your <<if $PC.dick >= 1>>stiff prick and begins stroking its length, quickly bringing you to orgasm and relieving you of your built up tension.<<else>>stiff clit and begins teasing it as well, quickly bringing you to orgasm and relieving you of your built up tension.<</if>> _HeU states, while licking _hisU fingers, "I always did enjoy the way you taste. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
-
-<<case "breasts">>
-	After a few hours, you awaken in the recovery wing with a sore chest. <<if $PC.belly >= 10000 || $PC.boobsBonus == 3>>Struggling to sit<<else>>Sitting<</if>> up, you immediately notice a new weight on your chest. Pulling the covers off yourself, you observe your new, soft C-cup boobs in the mirror-covered wall across from your bed. "So do you like them?", asks the surgeon's assistant, seating _himselfU behind you and wrapping _hisU hands around to your heaving breasts. "With these, you should be able to compete with any girls around you." _HeU begins groping your breasts, feeling the added mass for any oddities. "I know you're still a little sore, but bear with it." _HeU moves on to your nipples and begins teasing them. <<if $PC.lactation > 0>>_HeU lets out a surprised squeak when a gush of milk escapes your breasts and a moan escapes your lips. "<<if $PC.pregKnown == 1>>Should have expected that with the pregnancy and all.<<else>>You did recently have a child didn't you? Or have you just been enjoying your nipples too much?<</if>> Either way, this is a good thing. Your breasts work."<</if>> You can't help but moan under your building arousal as _heU massages and teases your new tits. "Enjoying yourself are we? Let me finish you off." _HeU sneaks a hand down to your <<if $PC.dick >= 1>>stiff prick and begins stroking its length, quickly bringing you to orgasm and relieving you of your built up tension.<<else>>stiff clit and begins teasing it as well, quickly bringing you to orgasm and relieving you of your built up tension.<</if>> _HeU states, while licking _hisU fingers, "I always did enjoy the way you taste. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
-=======
 	After a few hours, you awaken in the recovery wing with a sore chest. <<if $PC.belly >= 10000>>Struggling to sit<<else>>Sitting<</if>> up, you immediately notice how much lighter your breasts are. Pulling the covers off yourself, you observe your implant free boobs in the mirror-covered wall across from your bed. "So do you like them?", asks the surgeon's assistant, seating _himselfU behind you and wrapping _hisU hands around to your natural breasts. "We made sure to tighten them up a bit, get rid of that sag from not having the silicone pouch in them anymore." _HeU begins groping your breasts, feeling for any oddities. "I know you're still a little sore, but bear with it." _HeU moves on to your nipples and begins teasing them. <<if $PC.lactation > 0>>_HeU lets out a surprised squeak when a gush of milk escapes your breasts and a moan escapes your lips. "<<if $PC.pregKnown == 1>>Should have expected that with the pregnancy and all.<<else>>You did recently have a child didn't you? Or have you just been enjoying your nipples too much?<</if>> Either way, this is a good thing. Your breasts work."<</if>> You can't help but moan under your building arousal as _heU massages and teases your breasts. "Enjoying yourself are we? Let me finish you off." _HeU sneaks a hand down to your <<if $PC.dick != 0>>stiff prick and begins stroking its length, quickly bringing you to orgasm and relieving you of your built up tension.<<else>>stiff clit and begins teasing it as well, quickly bringing you to orgasm and relieving you of your built up tension.<</if>> _HeU states, while licking _hisU fingers, "I always did enjoy the way you taste. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
 
 <<case "breastShrinkage">>
@@ -110,7 +92,6 @@
 
 <<case "breasts">>
 	After a few hours, you awaken in the recovery wing with a sore chest. <<if $PC.belly >= 10000 || $PC.boobs >= 1400>>Struggling to sit<<else>>Sitting<</if>> up, you immediately notice a new weight on your chest. Pulling the covers off yourself, you observe your new, soft C-cup boobs in the mirror-covered wall across from your bed. "So do you like them?", asks the surgeon's assistant, seating _himselfU behind you and wrapping _hisU hands around to your heaving breasts. "With these, you should be able to compete with any girls around you." _HeU begins groping your breasts, feeling the added mass for any oddities. "I know you're still a little sore, but bear with it." _HeU moves on to your nipples and begins teasing them. <<if $PC.lactation > 0>>_HeU lets out a surprised squeak when a gush of milk escapes your breasts and a moan escapes your lips. "<<if $PC.pregKnown == 1>>Should have expected that with the pregnancy and all.<<else>>You did recently have a child didn't you? Or have you just been enjoying your nipples too much?<</if>> Either way, this is a good thing. Your breasts work."<</if>> You can't help but moan under your building arousal as _heU massages and teases your new tits. "Enjoying yourself are we? Let me finish you off." _HeU sneaks a hand down to your <<if $PC.dick != 0>>stiff prick and begins stroking its length, quickly bringing you to orgasm and relieving you of your built up tension.<<else>>stiff clit and begins teasing it as well, quickly bringing you to orgasm and relieving you of your built up tension.<</if>> _HeU states, while licking _hisU fingers, "I always did enjoy the way you taste. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1:src/player/pcSurgeryDegradation.tw
 
 <<case "buttReductionImplant">>
 	After a few hours, you awaken in the recovery wing, face-down in a bed made to accommodate a person with your body type, with a sore ass. You push yourself up and look at the mass under the cover behind you that is your rear, taking note of how much smaller it is now than when you arrived. "So do you like it?", asks the surgeon's assistant, seating _himselfU beside you and bringing _hisU hands to your butt. "Size isn't everything in an ass, shape is important too." _HeU begins groping your bottom, feeling around for any oddities. "I know you're still a little sore, but bear with it. There, everything feels good, now rest up and you'll be set! Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Groggy, you lie back down to sleep off the rest of the anesthesia before returning to your arcology.
diff --git a/src/pregmod/FSuckle.tw b/src/pregmod/FSuckle.tw
index 118af25516de8415505e75e8f6d2f70de067eac1..1a28099cdf09be02d153cb06b3d1cedb632a063a 100644
--- a/src/pregmod/FSuckle.tw
+++ b/src/pregmod/FSuckle.tw
@@ -149,17 +149,6 @@ You <<if _mood == 2>>demand<<else>>beckon<</if>> $activeSlave.slaveName to
 		<</if>>
 		Though muffled, you
 		<<if _mood == 2>>
-<<<<<<< HEAD
-			order $him to deal with <<if $PC.dick >= 1>>the erect monster pressing uncomfortably against the underside of your belly<<else>>the needy hole leaking all over your floor<</if>>.
-			<<if $activeSlave.fetish == "mindbroken">>
-				$He obeys without question and mechanically begins to <<if $PC.dick >= 1>>jerk you off<<else>>finger you<</if>>.
-			<<elseif $activeSlave.devotion >= -20>>
-				This proves unnecessary as, before you finish speaking, $he <<if $PC.dick >= 1>>wraps $his fingers around your needy cock<<else>><<if canSmell($activeSlave)>>smells<<else>>recognizes<</if>> your arousal<</if>> and begins to apply $his ministrations to take care of you<<if $activeSlave.nipples == "inverted" || $activeSlave.nipples == "partially inverted">>, as the sensations to $his nipple add so much more to the already surrounding breastflesh<</if>>. You buck to $his touch, forcing $him to try and steady $his breasts as your baby bump jumps with life.
-			<<elseif $activeSlave.trust < -20>>
-				$He begins to question your order, but quickly realizes that was a mistake as you grab $his hand and force it to your crotch. Hastily, $he begins to stroke <<if $PC.dick >= 1>>your dick<<else>>your pussy<</if>> until reassured that $he is pleasing you from your lusty moans and thrusting. $He does $his best, hoping to not anger you further as $he presses <<if $PC.dick >= 1>>the head<<else>>your lower lips<</if>> against $his nearby nipple.
-			<<else>>
-				Though $he furrows $his brow, $he decides it's better to get it over with quickly and in $his hand before $he is pinned in a much more compromising position by your pregnancy. $activeSlave.slaveName begins to <<if $PC.dick >= 1>>tug at your penis, pressing the head against $his nearby nipple, hoping this doesn't<<else>>finger your quivering pussy, rubbing $his thumb against your clit, hoping this won't<</if>> take too long.
-=======
 			order $him to deal with <<if $PC.dick != 0>>the erect monster pressing uncomfortably against the underside of your belly<<else>>the needy hole leaking all over your floor<</if>>.
 			<<if $activeSlave.fetish == "mindbroken">>
 				$He obeys without question and mechanically begins to <<if $PC.dick != 0>>jerk you off<<else>>finger you<</if>>.
@@ -169,7 +158,6 @@ You <<if _mood == 2>>demand<<else>>beckon<</if>> $activeSlave.slaveName to
 				$He begins to question your order, but quickly realizes that was a mistake as you grab $his hand and force it to your crotch. Hastily, $he begins to stroke <<if $PC.dick != 0>>your dick<<else>>your pussy<</if>> until reassured that $he is pleasing you from your lusty moans and thrusting. $He does $his best, hoping to not anger you further as $he presses <<if $PC.dick != 0>>the head<<else>>your lower lips<</if>> against $his nearby nipple.
 			<<else>>
 				Though $he furrows $his brow, $he decides it's better to get it over with quickly and in $his hand before $he is pinned in a much more compromising position by your pregnancy. $activeSlave.slaveName begins to <<if $PC.dick != 0>>tug at your penis, pressing the head against $his nearby nipple, hoping this doesn't<<else>>finger your quivering pussy, rubbing $his thumb against your clit, hoping this won't<</if>> take too long.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<</if>>
 		<<else>>
 			instruct $him to use $his hand to appease the evident arousal between your legs.
@@ -272,28 +260,16 @@ You <<if _mood == 2>>demand<<else>>beckon<</if>> $activeSlave.slaveName to
 	<</if>>
 	$his over-productive bosoms drip sweet cream on your face<<if $activeSlave.nipples == "inverted">>, the milk waiting to be sucked from the tight inverted holes above you<</if>><<if $PC.belly >= 10000>> and your belly brushing the undersides of $his tits<</if>>. You
 	<<if _mood == 2>>
-<<<<<<< HEAD
-		order $him to deal with <<if $PC.dick >= 1>>the erect monster pressing uncomfortably against the underside of your belly<<else>>the needy hole leaking all over your floor<</if>>.
-=======
 		order $him to deal with <<if $PC.dick != 0>>the erect monster pressing uncomfortably against the underside of your belly<<else>>the needy hole leaking all over your floor<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<else>>
 		<<if _mood == 2>>invite<<else>>instruct<</if>> $him to use $his hand to appease the ever evident arousal between your legs.
 	<</if>>
 	<<if $activeSlave.fetish == "mindbroken">>
-<<<<<<< HEAD
-		$He obeys without question and mechanically begins to <<if $PC.dick >= 1>>jerk you off<<else>>finger you<</if>>.
-	<<elseif $activeSlave.devotion >= -20 || $activeSlave.trust < -20>>
-		<<if $PC.dick >= 1>>Though $he believes it would be better for you to use $his other slew of pleasurable orifices, $he does not question your decision<<else>>$He happily sets to work on your clit<</if>>.
-	<<else>>
-		Though $he furrows $his brow, $he decides it's better to get it over with quickly and in $his hand rather than any other hole or in worse circumstances. $activeSlave.slaveName begins to <<if $PC.dick >= 1>>tug at your hardened penis<<else>>stroke your quivering pussy as best as $he can<</if>>, hoping this doesn't take too long.
-=======
 		$He obeys without question and mechanically begins to <<if $PC.dick != 0>>jerk you off<<else>>finger you<</if>>.
 	<<elseif $activeSlave.devotion >= -20 || $activeSlave.trust < -20>>
 		<<if $PC.dick != 0>>Though $he believes it would be better for you to use $his other slew of pleasurable orifices, $he does not question your decision<<else>>$He happily sets to work on your clit<</if>>.
 	<<else>>
 		Though $he furrows $his brow, $he decides it's better to get it over with quickly and in $his hand rather than any other hole or in worse circumstances. $activeSlave.slaveName begins to <<if $PC.dick != 0>>tug at your hardened penis<<else>>stroke your quivering pussy as best as $he can<</if>>, hoping this doesn't take too long.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<</if>>
 <</if>>
 
@@ -395,15 +371,9 @@ The two of you put so much into seeking pleasure in the act that you both cum at
 <<else>>
 	onto
 <</if>>
-<<<<<<< HEAD
-$his other breast<<if $PC.dick >= 1>><<if $PC.balls > 1>> and backflowing hard from your sheer volume<</if>><</if>>. You release $his nipple with a loud pop and lick your lips in delight.
-<<if $activeSlave.boobs >= 20000 && $activeSlave.nipples == "fuckable">>
-	Your <<if $PC.dick >= 1>>dick slips out<<else>>pussy separates<</if>> from $his other breast with a delicate pop, followed by lewd dripping noises and the sight of <<if $PC.dick >= 1>>semen<<else>>girlcum<</if>> and milk oozing from $his <<if $PC.dick >= 1>>newly expanded hole<<else>>nippleslit<</if>>.
-=======
 $his other breast<<if $PC.dick != 0>><<if $PC.balls >= 10>> and backflowing hard from your sheer volume<</if>><</if>>. You release $his nipple with a loud pop and lick your lips in delight.
 <<if $activeSlave.boobs >= 20000 && $activeSlave.nipples == "fuckable">>
 	Your <<if $PC.dick != 0>>dick slips out<<else>>pussy separates<</if>> from $his other breast with a delicate pop, followed by lewd dripping noises and the sight of <<if $PC.dick != 0>>semen<<else>>girlcum<</if>> and milk oozing from $his <<if $PC.dick != 0>>newly expanded hole<<else>>nippleslit<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 <</if>>
 <<if _mood == 2>>
 	For a moment, $he thought you were finished, but with your hormone fueled libido, $he'll be feeling a lot more than sore nipples but the time you tire of $his touch.
diff --git a/src/pregmod/breederProposal.tw b/src/pregmod/breederProposal.tw
index d662ff8c0a9512089a29b60739ebad585728bebc..99e59b87b982a06988d13c4ba2e92a974cc99449 100644
--- a/src/pregmod/breederProposal.tw
+++ b/src/pregmod/breederProposal.tw
@@ -93,11 +93,7 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
 			<</replace>>
 		<</link>>
 		</span>
-<<<<<<< HEAD
-	<<elseif $PC.dick >= 1 && $PC.vagina >= 1>>
-=======
 	<<elseif $PC.dick != 0 && $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		"We have read your proposal and agree. However, we shall set the standards for what shall qualify as breeding stock, not you. Our standards will be delivered to you shortly.
 		<br><br>
 		Your medical records say you have working female sex organs, and we respect your choice to not use them. But have you considered carrying another member's child? It will be extremely lucrative for you and go a long way to furthering our objectives."
diff --git a/src/pregmod/fDick.tw b/src/pregmod/fDick.tw
index f2cd4f0e1e2a3971689aff7ef2d913b2219c4226..95145e42bab4b1d3f65602ed41d46d5b8927c421 100644
--- a/src/pregmod/fDick.tw
+++ b/src/pregmod/fDick.tw
@@ -9,11 +9,7 @@
 
 /*NON-AMPUTEE*/
 <<if !isAmputee($activeSlave)>>
-<<<<<<< HEAD
-	You direct $activeSlave.slaveName to lie down and ready $himself as you step over to $him and align your <<if $PC.vagina >= 1>>vagina<<else>>ass<</if>> with $his
-=======
 	You direct $activeSlave.slaveName to lie down and ready $himself as you step over to $him and align your <<if $PC.vagina != -1>>vagina<<else>>ass<</if>> with $his
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<if ($activeSlave.vaginaPiercing > 1) && ($activeSlave.dick != 0)>>
 		pierced cock-head.
 	<<elseif ($activeSlave.vaginaPiercing == 1) && ($activeSlave.dick != 0)>>
@@ -151,11 +147,7 @@
 	<</if>>
 /*AMPUTEE*/
 <<else>>
-<<<<<<< HEAD
-	You step over to pick up $activeSlave.slaveName, lie $him down and get $him ready. Then you align your <<if $PC.vagina >= 1>> vagina <<else>> ass <</if>> with
-=======
 	You step over to pick up $activeSlave.slaveName, lie $him down and get $him ready. Then you align your <<if $PC.vagina != -1>> vagina <<else>> ass <</if>> with
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<if ($activeSlave.vaginaPiercing > 1) && ($activeSlave.dick != 0)>>
 		$his pierced cock-head.
 	<<elseif ($activeSlave.vaginaPiercing == 1) && ($activeSlave.dick != 0)>>
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index 5fccd56eedaf176be8e62f7071692ca2098cb17b..cfa40544c8af74a3ed23983cd0d0acce7df7e2df 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -556,48 +556,6 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 	<</if>>
 	$he does not reciprocate, since this marriage does not bind you.
 	<<if $assistant == 0>>
-<<<<<<< HEAD
-		"The marriage protocol now requires you to <<if $PC.dick >= 1>>fellate<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>perform cunnilingus on<</if>> the <<if $PC.title == 1>>groom<<else>>the bride<</if>>," $assistantName orders $him, and $he <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>.
-	<<else>>
-		<<if $assistantAppearance == "monstergirl">>
-			"To consecrate the ceremony," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar begins to play with _hisA dicks.
-		<<elseif $assistantAppearance == "shemale">>
-			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar starts to jill off.
-		<<elseif $assistantAppearance == "amazon">>
-			"To complete this ritual," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar starts to jill off.
-		<<elseif $assistantAppearance == "businesswoman">>
-			"To consecrate the marriage," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick >= 1>>fellate<<else>>perform cunnilingus on<</if>> the <<if $PC.title == 1>>groom<<else>>the bride<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar sneaks a hand down _hisA suit skirt, blushing furiously.
-		<<elseif $assistantAppearance == "fairy">>
-			"To seal the deal," $assistantName concludes, "$activeSlave.slaveName, you gotta drink the <<if $PC.title == 1>>groom's <<else>>bride's <</if>><<if $PC.dick >= 1>>semen<<if $PC.vagina >= 1>> and pussy juices<</if>><<else>>pussy juices<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar spreads _hisA legs while still hovering in the air and masturbates eagerly through _hisA half-worn robes.
-		<<elseif $assistantAppearance == "pregnant fairy">>
-			"To seal the deal," $assistantName concludes, "$activeSlave.slaveName, you gotta drink the <<if $PC.title == 1>>groom's <<else>>bride's <</if>><<if $PC.dick >= 1>>semen<<if $PC.vagina >= 1>> and pussy juices<</if>><<else>>pussy juices<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's pregnant avatar curls while still hovering in the air and masturbates eagerly around _hisA large belly.
-		<<elseif $assistantAppearance == "goddess">>
-			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you must now <<if $PC.dick >= 1>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s seed<<else>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s female juices<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistantName's avatar looks on approvingly, cradling _hisA perpetual pregnancy.
-		<<elseif $assistantAppearance == "hypergoddess">>
-			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you must now <<if $PC.dick >= 1>>drink the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s seed<<else>>drink the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s female juices<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistantName's avatar looks on approvingly, cradling _hisA massive perpetual pregnancy.
-		<<elseif $assistantAppearance == "loli">>
-			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you should now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina >= 1>>and lick _hisP cunny.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunny<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistantName's avatar sneaks a hand down _hisA dress, blushing furiously.
-		<<elseif $assistantAppearance == "preggololi">>
-			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you should now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s lovely cock<<if $PC.vagina >= 1>>and eat out _hisP cunt.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunt<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistantName's avatar attempts to sneak a hand down _hisA dress, but is thwarted by _hisA belly. _HeA instead openly rubs _hisA crotch through the front of _hisA dress, blushing furiously.
-		<<elseif $assistantAppearance == "schoolgirl">>
-			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, the rules say you should now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar starts to jill off.
-		<<elseif $assistantAppearance == "angel">>
-			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you must now join <<= PlayerName()>> in their bedroom and consummate this marriage." The slave <<if _reactionType == 0>>stares blankly<<else>>looks confused<</if>>. "After the wedding ends, would be the time." $assistantName says, covering _hisA face in embarrassment at the thought.
-		<<elseif $assistantAppearance == "cherub">>
-			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you should <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina >= 1>>and lick _hisP pussy,<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s pussy<</if>>, in the privacy of <<= PlayerName()>>'s bedroom, of course." $assistantName hides _hisA face in _hisA hands at the thought.
-		<<elseif $assistantAppearance == "incubus">>
-			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Enjoying the sight, $assistantName's avatar begins to furiously stroke its shaft.
-		<<elseif $assistantAppearance == "succubus">>
-			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar pulls out a large dildo and begins ramming it into _hisA own pussy.
-		<<elseif $assistantAppearance == "imp">>
-			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar hikes _hisA robe and vigorously rubs _hisA pussy.
-		<<elseif $assistantAppearance == "witch">>
-			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistantName's avatar begins to fidget at the sight, having summoned a vibrator beforehand and accidentally linked it to your pleasure.
-		<<elseif $assistantAppearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
-			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistantName's avatar begins to swell, drawing all its gained mass to its midsection. Its gravid middles splits vertically, allowing a new mass of flesh to fall to the floor, which quickly grows and reshapes itself into a spitting image of yourself. Meanwhile, the original twists into an image of $activeSlave.slaveName. $assistantName's two avatars begin copying you and $activeSlave.slaveName's actions perfectly.
-		<<else>>
-			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, the rules say you should now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. With only a symbol to express _hisA approval, $assistantName is forced to content _himselfA with spinning the symbol and making it glow in time with your new slave $wife's efforts.
-=======
 		"The marriage protocol now requires you to <<if $PC.dick != 0>>fellate<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>perform cunnilingus on<</if>> the <<if $PC.title == 1>>groom<<else>>the bride<</if>>," $assistantName orders $him, and $he <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>.
 	<<else>>
 		<<if $assistantAppearance == "monstergirl">>
@@ -638,7 +596,6 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistantName's avatar begins to swell, drawing all its gained mass to its midsection. Its gravid middles splits vertically, allowing a new mass of flesh to fall to the floor, which quickly grows and reshapes itself into a spitting image of yourself. Meanwhile, the original twists into an image of $activeSlave.slaveName. $assistantName's two avatars begin copying you and $activeSlave.slaveName's actions perfectly.
 		<<else>>
 			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, the rules say you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. With only a symbol to express _hisA approval, $assistantName is forced to content _himselfA with spinning the symbol and making it glow in time with your new slave $wife's efforts.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<</if>>
 		"Done," _heA says when you climax. "Enjoy your
 		<<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
@@ -843,11 +800,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 				<</replace>>
 			<</link>> //This will involve the slave having sex with a very large number of citizens, and will cost <<print cashFormat(10000)>>//
 		<</if>>
-<<<<<<< HEAD
-		<<if isFertile($activeSlave) && ($PC.dick >= 1)>>
-=======
 		<<if isFertile($activeSlave) && ($PC.dick != 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;
 			<<link "Impregnation ceremony">>
 				<<replace "#result">>
diff --git a/src/pregmod/fSlaveFeed.tw b/src/pregmod/fSlaveFeed.tw
index 6cf00adc4ff5a37184b9d227e4f9f64de2981ab1..a49c14148e49e086715d015c7ab4859cccc08b93 100644
--- a/src/pregmod/fSlaveFeed.tw
+++ b/src/pregmod/fSlaveFeed.tw
@@ -265,15 +265,9 @@ Next, you see to $activeSlave.slaveName.
 	<<elseif canDoAnal($activeSlave)>>
 		<<if $PC.dick == 0>>Donning a strap-on<<else>>Teasing your stiffening cock<</if>>, you push $him deeper into the protesting $milkTap.slaveName and mount $his <<if $activeSlave.anus == 0>>virgin <</if>> asshole, doggy style. You wrap your arms around $activeSlave.slaveName's middle so you may feel $his stomach swell with milk. <<if $activeSlave.inflation == 3>>You cum multiple times as you feel $his belly slowly round with milk, transform into a jiggling mass, and finally grow taut under your molesting fingers<<elseif $activeSlave.inflation == 2>>You cum several times as you feel $his belly slowly round with milk, finally transforming into a jiggling mass, under your molesting fingers<<else>>You cum as you feel $his belly slowly round with milk under your molesting fingers<</if>>. Only once your weight is removed from the squirming milk balloon is $he allowed to pull $himself off of the @@.mediumorchid;resentful $milkTap.slaveName@@ and catch $his breath.<<if $activeSlave.anus == 0>> $His senses were so overwhelmed, $he didn't even notice you @@.lime;broke in $his anus.@@<</if>>
 		<<set $activeSlave.counter.anal++, $analTotal++>>
-<<<<<<< HEAD
-	<<elseif $PC.dick >= 1 && $activeSlave.butt > 4>>
-		Teasing your stiffening cock, you push $him deeper into the protesting $milkTap.slaveName and squeeze your dick between $his huge butt cheeks. You wrap your arms around $activeSlave.slaveName's middle so you may feel $his stomach swell with milk as you fuck $his butt. <<if $activeSlave.inflation == 3>>You cum multiple times as you feel $his belly slowly round with milk, transform into a jiggling mass, and finally grow taut under your molesting fingers<<elseif $activeSlave.inflation == 2>>You cum several times as you feel $his belly slowly round with milk, finally transforming into a jiggling mass, under your molesting fingers<<else>>You cum as you feel $his belly slowly round with milk under your molesting fingers<</if>>. Only once your weight is removed from the squirming milk balloon is $he allowed to pull $himself off of the @@.mediumorchid;resentful $milkTap.slaveName@@ and catch $his breath.
-	<<elseif $PC.dick >= 1 && hasBothLegs($activeSlave)>>
-=======
 	<<elseif $PC.dick != 0 && $activeSlave.butt > 4>>
 		Teasing your stiffening cock, you push $him deeper into the protesting $milkTap.slaveName and squeeze your dick between $his huge butt cheeks. You wrap your arms around $activeSlave.slaveName's middle so you may feel $his stomach swell with milk as you fuck $his butt. <<if $activeSlave.inflation == 3>>You cum multiple times as you feel $his belly slowly round with milk, transform into a jiggling mass, and finally grow taut under your molesting fingers<<elseif $activeSlave.inflation == 2>>You cum several times as you feel $his belly slowly round with milk, finally transforming into a jiggling mass, under your molesting fingers<<else>>You cum as you feel $his belly slowly round with milk under your molesting fingers<</if>>. Only once your weight is removed from the squirming milk balloon is $he allowed to pull $himself off of the @@.mediumorchid;resentful $milkTap.slaveName@@ and catch $his breath.
 	<<elseif $PC.dick != 0 && hasBothLegs($activeSlave)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		Teasing your stiffening cock, you find a severe lack of places to stick your dick. Sighing, you hoist $his belted ass into the air, push $him deeper into the protesting $milkTap.slaveName and squeeze your dick between $his <<if $activeSlave.weight > 95>>soft <</if>>thighs. You wrap your arms around $activeSlave.slaveName's middle so you may feel $his stomach swell with milk as you fuck $his butt. <<if $activeSlave.inflation == 3>>You cum multiple times as you feel $his belly slowly round with milk, transform into a jiggling mass, and finally grow taut under your molesting fingers<<elseif $activeSlave.inflation == 2>>You cum several times as you feel $his belly slowly round with milk, finally transforming into a jiggling mass, under your molesting fingers<<else>>You cum as you feel $his belly slowly round with milk under your molesting fingers<</if>>. Only once your weight is removed from the squirming milk balloon is $he allowed to pull $himself off of the @@.mediumorchid;resentful $milkTap.slaveName@@ and catch $his breath.
 	<<else>>
 		With a lack of holes to penetrate, you simply wrap your arms around $him and push $him deeper into the protesting $milkTap.slaveName. You bring a hand to $activeSlave.slaveName's middle so you may feel $his stomach swell with milk and lead the other to your <<if $PC.dick == 0>>soaked pussy<<else>>stiff prick<</if>>. <<if $activeSlave.inflation == 3>>You cum multiple times as you feel $his belly slowly round with milk, transform into a jiggling mass, and finally grow taut under your molesting fingers<<elseif $activeSlave.inflation == 2>>You cum several times as you feel $his belly slowly round with milk, finally transforming into a jiggling mass, under your molesting fingers<<else>>You cum as you feel $his belly slowly round with milk under your molesting fingers<</if>>. Only once your weight is removed from the squirming milk balloon is $he allowed to pull $himself off of the @@.mediumorchid;resentful $milkTap.slaveName@@ and catch $his breath.
@@ -293,15 +287,9 @@ Next, you see to $activeSlave.slaveName.
 	<<elseif canDoAnal($activeSlave)>>
 		You position the restrained $activeSlave.slaveName so that you can penetrate $his <<if $activeSlave.anus == 0>>virgin <</if>>ass <<if $PC.dick == 0>>with a strap-on <</if>> while $he is forced to drink from $milkTap.slaveName's breasts. With every thrust into the squirming slave, you push $him into the moaning $milkTap.slaveName forcing even more milk down $his throat. You wrap an arm around $activeSlave.slaveName's middle so you may feel $his stomach swell with milk and place your other hand to $milkTap.slaveName's free nipple, knowing just how much $he loves it groped. <<if $activeSlave.inflation == 3>>You cum multiple times as you feel $his belly slowly round with milk, transform into a jiggling mass, and finally grow taut under your molesting fingers<<elseif $activeSlave.inflation == 2>>You cum several times as you feel $his belly slowly round with milk, finally transforming into a jiggling mass, under your molesting fingers<<else>>You cum as you feel $his belly slowly round with milk under your molesting fingers<</if>> and $milkTap.slaveName even more. _He2 is semi-conscious, drooling in @@.hotpink;pleasure and satisfaction,@@ by the time you release the bloated $activeSlave.slaveName from $his harness. Patting _his2 well milked breasts, you know _he2'll come out of it and be eagerly begging you for another milking soon. $activeSlave.slaveName, on the other hand, is regarding $his swollen stomach @@.mediumorchid;with disgust@@ and @@.gold;fear@@ of your power over $him.<<if $activeSlave.anus == 0>> $he @@.mediumorchid;hates you so much more@@ that you @@.lime;broke in $his virgin anus.@@<</if>>
 		<<set $activeSlave.counter.anal++, $analTotal++>>
-<<<<<<< HEAD
-	<<elseif $PC.dick >= 1 && $activeSlave.butt > 4>>
-		You position the restrained $activeSlave.slaveName so that you can rub your dick between $his huge butt cheeks while $he is forced to drink from $milkTap.slaveName's breasts. With every thrust against the squirming slave, you push $him into the moaning $milkTap.slaveName forcing even more milk down $his throat. You wrap an arm around $activeSlave.slaveName's middle so you may feel $his stomach swell with milk and place your other hand to $milkTap.slaveName's free nipple, knowing just how much $he loves it groped. <<if $activeSlave.inflation == 3>>You cum multiple times as you feel $his belly slowly round with milk, transform into a jiggling mass, and finally grow taut under your molesting fingers<<elseif $activeSlave.inflation == 2>>You cum several times as you feel $his belly slowly round with milk, finally transforming into a jiggling mass, under your molesting fingers<<else>>You cum as you feel $his belly slowly round with milk under your molesting fingers<</if>> and $milkTap.slaveName even more. _He2 is semi-conscious, drooling in @@.hotpink;pleasure and satisfaction,@@ by the time you release the bloated $activeSlave.slaveName from $his harness. Patting _his2 well milked breasts, you know $he'll come out of it and be eagerly begging you for another milking soon. $activeSlave.slaveName, on the other hand, is regarding $his swollen stomach, and cum soaked back, @@.mediumorchid;with disgust@@ and @@.gold;fear@@ of your power over $him.
-	<<elseif $PC.dick >= 1 && hasBothLegs($activeSlave)>>
-=======
 	<<elseif $PC.dick != 0 && $activeSlave.butt > 4>>
 		You position the restrained $activeSlave.slaveName so that you can rub your dick between $his huge butt cheeks while $he is forced to drink from $milkTap.slaveName's breasts. With every thrust against the squirming slave, you push $him into the moaning $milkTap.slaveName forcing even more milk down $his throat. You wrap an arm around $activeSlave.slaveName's middle so you may feel $his stomach swell with milk and place your other hand to $milkTap.slaveName's free nipple, knowing just how much $he loves it groped. <<if $activeSlave.inflation == 3>>You cum multiple times as you feel $his belly slowly round with milk, transform into a jiggling mass, and finally grow taut under your molesting fingers<<elseif $activeSlave.inflation == 2>>You cum several times as you feel $his belly slowly round with milk, finally transforming into a jiggling mass, under your molesting fingers<<else>>You cum as you feel $his belly slowly round with milk under your molesting fingers<</if>> and $milkTap.slaveName even more. _He2 is semi-conscious, drooling in @@.hotpink;pleasure and satisfaction,@@ by the time you release the bloated $activeSlave.slaveName from $his harness. Patting _his2 well milked breasts, you know $he'll come out of it and be eagerly begging you for another milking soon. $activeSlave.slaveName, on the other hand, is regarding $his swollen stomach, and cum soaked back, @@.mediumorchid;with disgust@@ and @@.gold;fear@@ of your power over $him.
 	<<elseif $PC.dick != 0 && hasBothLegs($activeSlave)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		You position the restrained $activeSlave.slaveName so that you can fuck $his <<if $activeSlave.weight > 95>>soft <</if>>thighs, for a lack of anything better, while $he is forced to drink from $milkTap.slaveName's breasts. With every thrust against the squirming slave, you push $him into the moaning $milkTap.slaveName forcing even more milk down $his throat. You wrap an arm around $activeSlave.slaveName's middle so you may feel $his stomach swell with milk and place your other hand to $milkTap.slaveName's free nipple, knowing just how much $he loves it groped. <<if $activeSlave.inflation == 3>>You cum multiple times as you feel $his belly slowly round with milk, transform into a jiggling mass, and finally grow taut under your molesting fingers<<elseif $activeSlave.inflation == 2>>You cum several times as you feel $his belly slowly round with milk, finally transforming into a jiggling mass, under your molesting fingers<<else>>You cum as you feel $his belly slowly round with milk under your molesting fingers<</if>> and $milkTap.slaveName even more. _He2 is semi-conscious, drooling in @@.hotpink;pleasure and satisfaction,@@ by the time you release the bloated $activeSlave.slaveName from $his harness. Patting _his2 well milked breasts, you know _he2'll come out of it and be eagerly begging you for another milking soon. $activeSlave.slaveName, on the other hand, is regarding $his swollen, cum-covered stomach @@.mediumorchid;with disgust@@ and @@.gold;fear@@ of your power over $him.
 	<<else>>
 		You position the restrained $activeSlave.slaveName so that you can rub your <<if $PC.dick == 0>>clit<<else>>dick<</if>> against $him while $he is forced to drink from $milkTap.slaveName's breasts, since $he lacks any better way to please you while you lavish attention on your eager cow. With every thrust against the squirming slave, you push $him into the moaning $milkTap.slaveName forcing even more milk down $his throat. You wrap an arm around $activeSlave.slaveName's middle so you may feel $his stomach swell with milk and place your other hand to $milkTap.slaveName's free nipple, knowing just how much $he loves it groped. <<if $activeSlave.inflation == 3>>You cum multiple times as you feel $his belly slowly round with milk, transform into a jiggling mass, and finally grow taut under your molesting fingers<<elseif $activeSlave.inflation == 2>>You cum several times as you feel $his belly slowly round with milk, finally transforming into a jiggling mass, under your molesting fingers<<else>>You cum as you feel $his belly slowly round with milk under your molesting fingers<</if>> and $milkTap.slaveName even more. _He2 is semi-conscious, drooling in @@.hotpink;pleasure and satisfaction,@@ by the time you release the bloated $activeSlave.slaveName from $his harness. Patting _his2 well milked breasts, you know _he2'll come out of it and be eagerly begging you for another milking soon. $activeSlave.slaveName, on the other hand, is regarding $his swollen stomach @@.mediumorchid;with disgust@@ and @@.gold;fear@@ of your power over $him.
@@ -345,15 +333,9 @@ Next, you see to $activeSlave.slaveName.
 	<<elseif canDoAnal($activeSlave)>>
 		You order $activeSlave.slaveName to lift $his ass so you can penetrate $his <<if $activeSlave.anus == 0>>virgin <</if>>ass <<if $PC.dick == 0>>with a strap-on <</if>> while $he drinks from $milkTap.slaveName's breasts. $He submissively obeys. With every thrust into the moaning slave, you push $him into the smiling $milkTap.slaveName forcing even more milk down $his throat.
 		<<set $activeSlave.counter.anal++, $analTotal++>>
-<<<<<<< HEAD
-	<<elseif $PC.dick >= 1 && $activeSlave.butt > 4>>
-		You order $activeSlave.slaveName to lift $his ass so you can rub your dick between $his huge butt cheeks while $he drinks from $milkTap.slaveName's breasts. $He submissively obeys. With every thrust against the chaste slave, you push $him into the smiling $milkTap.slaveName forcing even more milk down $his throat.
-	<<elseif $PC.dick >= 1 && hasBothLegs($activeSlave)>>
-=======
 	<<elseif $PC.dick != 0 && $activeSlave.butt > 4>>
 		You order $activeSlave.slaveName to lift $his ass so you can rub your dick between $his huge butt cheeks while $he drinks from $milkTap.slaveName's breasts. $He submissively obeys. With every thrust against the chaste slave, you push $him into the smiling $milkTap.slaveName forcing even more milk down $his throat.
 	<<elseif $PC.dick != 0 && hasBothLegs($activeSlave)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		You order $activeSlave.slaveName to lift $his ass so you can fuck $his <<if $activeSlave.weight > 95>>soft <</if>>thighs, for a lack of anything better, while $he drinks from $milkTap.slaveName's breasts. $He submissively obeys. With every thrust against the chaste slave, you push $him into the smiling $milkTap.slaveName forcing even more milk down $his throat.
 	<<else>>
 		You order $activeSlave.slaveName to position $himself so you can rub your <<if $PC.dick == 0>>clit<<else>>dick<</if>> against $him while $he drinks from $milkTap.slaveName's breasts, since $he lacks any better way to please you while you lavish attention on your happy cow. With every thrust against the squirming slave, you push $him into the smiling $milkTap.slaveName forcing even more milk down $his throat.
@@ -375,15 +357,9 @@ Next, you see to $activeSlave.slaveName.
 	<<elseif canDoAnal($activeSlave)>>
 		You know that signal, so you hilt yourself in <<if $activeSlave.anus == 0>>virgin <</if>>ass <<if $PC.dick == 0>>with a strap-on <</if>> and begin fucking $him against $milkTap.slaveName's tits. With every thrust into the moaning slave, you push $him into the grinning $milkTap.slaveName forcing even more milk down $his throat.
 		<<set $activeSlave.counter.anal++, $analTotal++>>
-<<<<<<< HEAD
-	<<elseif $PC.dick >= 1 && $activeSlave.butt > 4>>
-		You know that signal, but $he isn't allowed to get penetrated, so you settle for sticking your dick between $his huge butt cheeks and fucking $him against $milkTap.slaveName's tits. With every thrust against the moaning slave, you push $him into the grinning $milkTap.slaveName forcing even more milk down $his throat.
-	<<elseif $PC.dick >= 1 && hasBothLegs($activeSlave)>>
-=======
 	<<elseif $PC.dick != 0 && $activeSlave.butt > 4>>
 		You know that signal, but $he isn't allowed to get penetrated, so you settle for sticking your dick between $his huge butt cheeks and fucking $him against $milkTap.slaveName's tits. With every thrust against the moaning slave, you push $him into the grinning $milkTap.slaveName forcing even more milk down $his throat.
 	<<elseif $PC.dick != 0 && hasBothLegs($activeSlave)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		You know that signal, but $he isn't allowed to get penetrated, so you settle for sticking your dick between $his <<if $activeSlave.weight > 95>>soft <</if>>thighs, for a lack of anything better, and fuck $him against $milkTap.slaveName's tits. With every thrust against the moaning slave, you push $him into the grinning $milkTap.slaveName forcing even more milk down $his throat.
 	<<else>>
 		You know that signal, but $he isn't allowed to get fucked, so you reposition $him so you can rub your <<if $PC.dick == 0>>clit<<else>>dick<</if>> against $him while $he drinks from $milkTap.slaveName's tits. With every thrust against the moaning slave, you push $him into the grinning $milkTap.slaveName forcing even more milk down $his throat.
@@ -661,21 +637,12 @@ Next, you see to $activeSlave.slaveName.
 	<<elseif canDoAnal($activeSlave)>>
 		<<if $PC.dick == 0>>Donning a strap-on<<else>>Stroking your stiffening cock<</if>>, you wait for the perfect moment and mount $his <<if $activeSlave.anus == 0>>virgin <</if>>asshole, doggy style.
 		<<set $activeSlave.counter.anal++, $analTotal++>>
-<<<<<<< HEAD
-	<<elseif $PC.dick >= 1 && $activeSlave.butt > 4>>
-		Stroking your stiffening cock, you wait for the perfect moment and slip your dick between $his huge butt cheeks.
-	<<elseif $PC.dick >= 1 && hasBothLegs($activeSlave)>>
-		Stroking your stiffening cock, you wait for the perfect moment, hoist up $his rear and slip your dick between $his <<if $activeSlave.weight > 95>>soft <</if>>thighs.
-	<<else>>
-		As you watch $his butt, it becomes clear just how few ways there are to use $him to get off. <<if $PC.dick >= 1>>You settle for rubbing your erection against $his back<<else>>You settle for a vibrating dildo stuck deep into your pussy<</if>>, you'll need both hands to fondle your toy.
-=======
 	<<elseif $PC.dick != 0 && $activeSlave.butt > 4>>
 		Stroking your stiffening cock, you wait for the perfect moment and slip your dick between $his huge butt cheeks.
 	<<elseif $PC.dick != 0 && hasBothLegs($activeSlave)>>
 		Stroking your stiffening cock, you wait for the perfect moment, hoist up $his rear and slip your dick between $his <<if $activeSlave.weight > 95>>soft <</if>>thighs.
 	<<else>>
 		As you watch $his butt, it becomes clear just how few ways there are to use $him to get off. <<if $PC.dick != 0>>You settle for rubbing your erection against $his back<<else>>You settle for a vibrating dildo stuck deep into your pussy<</if>>, you'll need both hands to fondle your toy.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<</if>>
 	You wrap your arms around $activeSlave.slaveName's middle so you may feel $his stomach swell with ejaculate. <<if $activeSlave.inflation == 3>>You cum multiple times as you feel $his belly slowly round with cum, transform into a jiggling mass, and finally grow taut under your molesting fingers<<elseif $activeSlave.inflation == 2>>You cum several times as you feel $his belly slowly round with cum, finally transforming into a jiggling mass, under your molesting fingers<<else>>You cum as you feel $his belly slowly round with cum under your molesting fingers<</if>>. Only once your weight is removed from the squirming cum balloon is $he allowed to pull off of the @@.mediumorchid;exhausted $milkTap.slaveName's@@ cock and catch $his breath.
 	<<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>>
@@ -720,15 +687,9 @@ Next, you see to $activeSlave.slaveName.
 	<<elseif canDoAnal($activeSlave)>>
 		You order $activeSlave.slaveName to lift $his ass so you can penetrate $his <<if $activeSlave.anus == 0>>virgin <</if>>ass <<if $PC.dick == 0>>with a strap-on <</if>> while $he sucks $milkTap.slaveName's cock. With every thrust into the squirming slave, you push $milkTap.slaveName's cock deeper down $his throat, giving $milkTap.slaveName's orgasms a straight shot into the moaning slave's gullet.
 		<<set $activeSlave.counter.anal++, $analTotal++>>
-<<<<<<< HEAD
-	<<elseif $PC.dick >= 1 && $activeSlave.butt > 4>>
-		You order $activeSlave.slaveName to position $his ass so you can rub your dick between $his huge butt cheeks while $he sucks $milkTap.slaveName's cock. With every thrust against the squirming slave, you push $milkTap.slaveName's cock deeper down $his throat, giving $milkTap.slaveName's orgasms a straight shot into the moaning slave's gullet.
-	<<elseif $PC.dick >= 1 && hasBothLegs($activeSlave)>>
-=======
 	<<elseif $PC.dick != 0 && $activeSlave.butt > 4>>
 		You order $activeSlave.slaveName to position $his ass so you can rub your dick between $his huge butt cheeks while $he sucks $milkTap.slaveName's cock. With every thrust against the squirming slave, you push $milkTap.slaveName's cock deeper down $his throat, giving $milkTap.slaveName's orgasms a straight shot into the moaning slave's gullet.
 	<<elseif $PC.dick != 0 && hasBothLegs($activeSlave)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		You order $activeSlave.slaveName to position $his ass so you can fuck $his <<if $activeSlave.weight > 95>>soft <</if>>thighs while $he sucks $milkTap.slaveName's cock. With every thrust against the squirming slave, you push $milkTap.slaveName's cock deeper down $his throat, giving $milkTap.slaveName's orgasms a straight shot into the moaning slave's gullet.
 	<<else>>
 		You order $activeSlave.slaveName to position $himself so you can rub your <<if $PC.dick == 0>>clit<<else>>dick<</if>> against $him while $he is forced to suck $milkTap.slaveName's dick, since $he lacks any better way to please you. With every thrust against the squirming slave, you force the moaning $milkTap.slaveName's cock deep into $his throat.
@@ -747,15 +708,9 @@ Next, you see to $activeSlave.slaveName.
 	<<elseif canDoAnal($activeSlave)>>
 		You order $activeSlave.slaveName to lift $his ass so you can penetrate $his <<if $activeSlave.anus == 0>>virgin <</if>>ass <<if $PC.dick == 0>>with a strap-on <</if>> while $he sucks $milkTap.slaveName's cock. $He submissively obeys. With every thrust into the moaning slave, you push milkTap.slaveName's dick deeper down $his throat.
 		<<set $activeSlave.counter.anal++, $analTotal++>>
-<<<<<<< HEAD
-	<<elseif $PC.dick >= 1 && $activeSlave.butt > 4>>
-		You order $activeSlave.slaveName to lift $his ass so you can rub your dick between $his huge butt cheeks while $he sucks $milkTap.slaveName's cock. $He submissively obeys. With every thrust against the moaning slave, you push milkTap.slaveName's dick deeper down $his throat.
-	<<elseif $PC.dick >= 1 && hasBothLegs($activeSlave)>>
-=======
 	<<elseif $PC.dick != 0 && $activeSlave.butt > 4>>
 		You order $activeSlave.slaveName to lift $his ass so you can rub your dick between $his huge butt cheeks while $he sucks $milkTap.slaveName's cock. $He submissively obeys. With every thrust against the moaning slave, you push milkTap.slaveName's dick deeper down $his throat.
 	<<elseif $PC.dick != 0 && hasBothLegs($activeSlave)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		You order $activeSlave.slaveName to lift $his ass so you can fuck $his <<if $activeSlave.weight > 95>>soft <</if>>thighs while $he sucks $milkTap.slaveName's cock. $He submissively obeys. With every thrust against the moaning slave, you push milkTap.slaveName's dick deeper down $his throat.
 	<<else>>
 		You order $activeSlave.slaveName to position $himself so you can rub your <<if $PC.dick == 0>>clit<<else>>dick<</if>> against $him while $he sucks $milkTap.slaveName's cock, since $he lacks any better way to please you. $He submissively obeys. With every thrust against the moaning slave, you push milkTap.slaveName's dick deeper down $his throat.
diff --git a/src/pregmod/fSlaveSlaveDickConsummate.tw b/src/pregmod/fSlaveSlaveDickConsummate.tw
index fe64a2d1075622226e521e13ec7ebab1c9220e19..b01264c78161d6761532b804b079bb160628fe54 100644
--- a/src/pregmod/fSlaveSlaveDickConsummate.tw
+++ b/src/pregmod/fSlaveSlaveDickConsummate.tw
@@ -514,27 +514,16 @@ You call $slaverapistx.slaveName into the room.
 	<</if>> /* closes losing virginity */
 	$slaverapistx.slaveName happily rides $activeSlave.slaveName, who occasionally thrusts $his hips up. After a little while, when $slaverapistx.slaveName bends down to engage in passionate kissing, you come over and
 	<<if canDoAnal($slaverapistx) && $slaverapistx.anus > 0>>
-<<<<<<< HEAD
-		penetrate $slaverapistx.slaveName's free asshole with your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>>. With the extra stimulus of double penetration, _he2 comes indecently hard. The two of them collapse into an exhausted, satisfied pile of slave flesh.
-=======
 		penetrate $slaverapistx.slaveName's free asshole with your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>>. With the extra stimulus of double penetration, _he2 comes indecently hard. The two of them collapse into an exhausted, satisfied pile of slave flesh.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $slaverapistx.counter.anal++, $analTotal++>>
 		<<if canImpreg($slaverapistx, $PC)>>
 			<<= knockMeUp($slaverapistx, 5, 1, -1, 1)>>
 		<</if>>
 	<<elseif canDoVaginal($activeSlave)>>
-<<<<<<< HEAD
-		penetrate $activeSlave.slaveName's free pussy with your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>>. With the double stimulus of penetrating a tight vagina and being penetrated while restrained, $he comes indecently hard. The two of them collapse into an exhausted, satisfied pile of slave flesh.
-		<<= VCheck.Vaginal(1)>>
-	<<elseif canDoAnal($activeSlave)>>
-		penetrate $activeSlave.slaveName's free asshole with your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>>. With the double stimulus of penetrating a tight vagina and being penetrated while restrained, $he comes indecently hard. The two of them collapse into an exhausted, satisfied pile of slave flesh.
-=======
 		penetrate $activeSlave.slaveName's free pussy with your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>>. With the double stimulus of penetrating a tight vagina and being penetrated while restrained, $he comes indecently hard. The two of them collapse into an exhausted, satisfied pile of slave flesh.
 		<<= VCheck.Vaginal(1)>>
 	<<elseif canDoAnal($activeSlave)>>
 		penetrate $activeSlave.slaveName's free asshole with your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>>. With the double stimulus of penetrating a tight vagina and being penetrated while restrained, $he comes indecently hard. The two of them collapse into an exhausted, satisfied pile of slave flesh.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<= VCheck.Anal(1)>>
 	<<else>>
 		pull _his2 face to your crotch. All this penetration has got you horny and there are no free holes to fuck, so a little oral will have to do. It doesn't take long for all three of you to collapse into an exhausted, satisfied pile of flesh.
diff --git a/src/pregmod/forceFeeding.tw b/src/pregmod/forceFeeding.tw
index d5190f27f3a88c719df921c1a54c1612afec3aaf..6311876a9d0833c4b04d6a66f579d6f02a30005c 100644
--- a/src/pregmod/forceFeeding.tw
+++ b/src/pregmod/forceFeeding.tw
@@ -385,11 +385,7 @@ and a little jiggle from $his gut.
 				<<set _doMe = 0>>
 				$His <<if _sexType == "vaginal">>pussy<<else>>ass<</if>> is under a lot of pressure from $his swollen middle and surely would feel amazing; it's even <<if _sexType == "vaginal">>sopping wet for<<else>>eagerly winking at<</if>> you. Unfortunately, no matter how hard you try, you can't find a position that will accommodate both $his food-stuffed stomach and your own gravid middle. Sighing, you settle for $his mouth instead.
 			<<else>>
-<<<<<<< HEAD
-				<<if $PC.dick >= 1>>
-=======
 				<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					You're already rock hard so you
 				<<else>>
 					<<if _sexType == "vaginal">>
@@ -504,11 +500,7 @@ and a little jiggle from $his gut.
 			<<set _doMe = 0>>
 		<</if>>
 		<<if _doMe == 0>>
-<<<<<<< HEAD
-			<<if $PC.dick >= 1>>
-=======
 			<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				You crawl onto the couch above $his head and lower your erect cock straight into $his waiting mouth. $He eagerly sucks you off, $his belly wobbling with every thrust into $his throat. You cum fast and hard into $him, a product of being on the edge during $his feeding;
 				<<if $activeSlave.behavioralFlaw == "gluttonous">>
 					$he takes it like nothing and resumes sucking, $his gluttony showing no bounds.
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index ee64f35880e23e52bcec4fd0420f0fa3400d7567..358a8498d2ffc29c33d722e06e384e7ca6330cb7 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -480,17 +480,10 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 You slowly strip down, gauging $his reactions to your show, until you are fully nude before $him.
 
 <<if $activeSlave.vagina > -1>>
-<<<<<<< HEAD
-	<<if ($PC.dick == 0) && ($PC.boobs >= 1)>>
-		$He notices $he has the same parts as you, and @@.mediumaquamarine;connects a little more@@ with a fellow girl.
-		<<set $activeSlave.trust += 4>>
-	<<elseif $PC.dick >= 1>>
-=======
 	<<if ($PC.dick != 0) && ($PC.boobs >= 300)>>
 		$He notices $he has the same parts as you, and @@.mediumaquamarine;connects a little more@@ with a fellow girl.
 		<<set $activeSlave.trust += 4>>
 	<<elseif $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		$He notices your privates differ from $hers, and thanks to the tank's teachings, @@.hotpink;can't look away.@@
 		<<set $activeSlave.devotion += 4>>
 		<<if $incubatorReproductionSetting > 0>>
@@ -498,17 +491,10 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
 		<</if>>
 	<</if>>
 <<elseif $activeSlave.dick > 0>>
-<<<<<<< HEAD
-	<<if ($PC.dick >= 1) && ($PC.boobs == 0)>>
-		$He notices $he has the same parts as you, and @@.mediumaquamarine;connects a little more@@ with a fellow boy.
-		<<set $activeSlave.trust += 4>>
-	<<elseif $PC.vagina >= 1>>
-=======
 	<<if ($PC.dick != 0) && ($PC.boobs < 300)>>
 		$He notices $he has the same parts as you, and @@.mediumaquamarine;connects a little more@@ with a fellow boy.
 		<<set $activeSlave.trust += 4>>
 	<<elseif $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		$He notices your privates differ from $hers, and thanks to the tank's teachings, @@.hotpink;can't look away.@@
 		<<set $activeSlave.devotion += 4>>
 		<<if $incubatorReproductionSetting > 0>>
@@ -773,11 +759,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
 
 <br><<link "Give $him a cum shower">>
 <<replace "#result">>
-<<<<<<< HEAD
-	You seat the curious $desc in the center of your office and order every slave available capable of getting hard to report to your office. Once everyone is assembled and erect, you order them to encircle the aroused $girl and shower $him in cum. As they begin<<if canAchieveErection($activeSlave)>> (with $activeSlave.slaveName stroking $his own erection too)<</if>>, <<if $PC.dick >= 1 && $PC.vagina >= 1>>you begin fingering yourself while jacking off alongside your slaves<<elseif $PC.dick >= 1>>you join in the circlejerk as well<<else>>you sit back to finger yourself to the show<</if>>. When the first burst of cum streaks across $his face, $he gasps in surprise, giving another load the chance to launch into $his gaping mouth. $He gags before licking $his lips and opening wide for the next load. After everyone has finished, $activeSlave.slaveName is coated, head to <<if !hasAnyLegs($activeSlave)>>hip<<else>>toe<</if>>, in cum and @@.hotpink;thrilled to be the center of attention.@@ Though $he may not be a cumslut now, $he certainly has the potential to become one.
-=======
 	You seat the curious $desc in the center of your office and order every slave available capable of getting hard to report to your office. Once everyone is assembled and erect, you order them to encircle the aroused $girl and shower $him in cum. As they begin<<if canAchieveErection($activeSlave)>> (with $activeSlave.slaveName stroking $his own erection too)<</if>>, <<if $PC.dick != 0 && $PC.vagina != -1>>you begin fingering yourself while jacking off alongside your slaves<<elseif $PC.dick != 0>>you join in the circlejerk as well<<else>>you sit back to finger yourself to the show<</if>>. When the first burst of cum streaks across $his face, $he gasps in surprise, giving another load the chance to launch into $his gaping mouth. $He gags before licking $his lips and opening wide for the next load. After everyone has finished, $activeSlave.slaveName is coated, head to <<if !hasAnyLegs($activeSlave)>>hip<<else>>toe<</if>>, in cum and @@.hotpink;thrilled to be the center of attention.@@ Though $he may not be a cumslut now, $he certainly has the potential to become one.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<set $activeSlave.devotion += 4>>
 	<<if random(1,100) > 60 && $activeSlave.fetish == "none">>
 		<<set $activeSlave.fetish = "cumslut">>
@@ -815,11 +797,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
 <</replace>>
 <</link>>
 
-<<<<<<< HEAD
-<<if $PC.vagina >= 1>>
-=======
 <<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<if $activeSlave.dick > 0 && canAchieveErection($activeSlave)>>
 		<br><<link "Dominate $his penis">>
 		<<replace "#result">>
@@ -899,11 +877,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
 					<</if>>
 				</span>
 			<<else>>
-<<<<<<< HEAD
-				you quickly bind the base of $his penis, denying $him release. You grind your cunt into $his face, letting $him know that YOU are the one who'll be orgasming here, not $him. Only once you have initiated the new slave by soaking $his face in your cum do you release $his dick and lean back to avoid the coming blast. A few strokes later and your hand is coated in $his cum. You turn around and order the exhausted $girl to clean $his cum off your hand<<if $PC.dick >= 1>> and to finish off $his twitching dick<</if>>; $he might not be a submissive, but $he is @@.hotpink;willing to let you have your way@@ with $his body used and may even grow to enjoy it.
-=======
 				you quickly bind the base of $his penis, denying $him release. You grind your cunt into $his face, letting $him know that YOU are the one who'll be orgasming here, not $him. Only once you have initiated the new slave by soaking $his face in your cum do you release $his dick and lean back to avoid the coming blast. A few strokes later and your hand is coated in $his cum. You turn around and order the exhausted $girl to clean $his cum off your hand<<if $PC.dick != 0>> and to finish off $his twitching dick<</if>>; $he might not be a submissive, but $he is @@.hotpink;willing to let you have your way@@ with $his body used and may even grow to enjoy it.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<set $activeSlave.devotion += 5>>
 				<<if random(1,100) > 60 && $activeSlave.fetish == "none">>
 					<<set $activeSlave.fetish = "submissive">>
@@ -1123,11 +1097,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
 			<<set $activeSlave.counter.anal += 10, $analTotal += 10>>
 			<<= assignJob($activeSlave, "dairy")>>
 			<<replace "#result">>
-<<<<<<< HEAD
-				Making use of $his blissful ignorance, you restrain $him on one of the chairs in your office in an approximation of the position $he'll occupy in $dairyName. Then you put a mask on $him, like the ones the machines there feature, and turn it on, watching the slave squirm against $his restraints under the sudden bombardment of garish hardcore porn. Finally, you add a dildo gag, both to mimic the dildo that will feed $him, and to keep your office reasonably quiet. Then, for the rest of the day, you use $his vulnerable <<if $activeSlave.vagina > -1>>holes<<else>>asshole<</if>> as an outlet for your sexual energy. You are not gentle; in fact, the point of the whole exercise is to gape $him. By the evening $he's been fucked so hard that $he's stopped jerking against the chair when you pound <<if $PC.dick >= 1>>your huge cock<<else>>a huge strap-on<</if>> in and out of $him, so you're obliged to get creative, sliding fingers in alongside <<if $PC.dick >= 1>>yourself<<else>>it<</if>> to really blow $him out. Once that gets too easy, you start adding dildos for double penetration. By the night $he's properly prepared to take $dairyName's giant phalli, and you're bored, so you consign $him to $his fate. $He might have some opinion on how $he's spent $his day, but it's unlikely $he'll remember it by tomorrow, what with the forearm-sized dildos sliding in and out of $his throat<<if $activeSlave.vagina > -1>>, cunt,<</if>> and asshole.
-=======
 				Making use of $his blissful ignorance, you restrain $him on one of the chairs in your office in an approximation of the position $he'll occupy in $dairyName. Then you put a mask on $him, like the ones the machines there feature, and turn it on, watching the slave squirm against $his restraints under the sudden bombardment of garish hardcore porn. Finally, you add a dildo gag, both to mimic the dildo that will feed $him, and to keep your office reasonably quiet. Then, for the rest of the day, you use $his vulnerable <<if $activeSlave.vagina > -1>>holes<<else>>asshole<</if>> as an outlet for your sexual energy. You are not gentle; in fact, the point of the whole exercise is to gape $him. By the evening $he's been fucked so hard that $he's stopped jerking against the chair when you pound <<if $PC.dick != 0>>your huge cock<<else>>a huge strap-on<</if>> in and out of $him, so you're obliged to get creative, sliding fingers in alongside <<if $PC.dick != 0>>yourself<<else>>it<</if>> to really blow $him out. Once that gets too easy, you start adding dildos for double penetration. By the night $he's properly prepared to take $dairyName's giant phalli, and you're bored, so you consign $him to $his fate. $He might have some opinion on how $he's spent $his day, but it's unlikely $he'll remember it by tomorrow, what with the forearm-sized dildos sliding in and out of $his throat<<if $activeSlave.vagina > -1>>, cunt,<</if>> and asshole.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<</replace>>
 			<</link>>
 		<</if>>
diff --git a/src/pregmod/pInsemination.tw b/src/pregmod/pInsemination.tw
index 7b0c2bbadcefb7744fdd134e100455ae4ca24d30..f488a1718136877d0c8105bc0dabbd61ba420503 100644
--- a/src/pregmod/pInsemination.tw
+++ b/src/pregmod/pInsemination.tw
@@ -78,22 +78,11 @@
 
 <<case "preggo">>
 	<<if $preggoCount == 0>>
-<<<<<<< HEAD
-		You arrive at the apartment of the rather moody girl with both sets of functional genitals. What answers the door surprises you; she is extremely pregnant, easily ready to drop. Positioning you over the edge of her bed, she mounts you and begins to enjoy herself. Between the sensations within your pussy, <<if $PC.dick >= 1>>your dick's motions against her satin sheets,<</if>>and her belly rubbing up and down your ass and lower back; you quickly tense up in orgasm, prompting her to cum strongly into your pussy. You help her onto her couch and head on your way, but not before she informs you that she'll be waiting to fuck you when you are as pregnant as she is now.
-		<<set $preggoCount++>>
-	<<elseif $preggoCount == 1>>
-		You arrive at the apartment of the heavily pregnant futa. When she answers the door and you are greeted by an even larger belly than last time it becomes abundantly clear that the two of you are on similar reproductive schedules. Noticing your look, she grabs your hands and happily says "Twins!" You wrap your arms around your lover for the evening and help her back to her bed, enjoying the weight of her middle. She stops you once she takes a seat and asks "You know, I have some fertility drugs if you want to get as big as me this time, cutie?" You shake your head "no"; being that pregnant would certainly impede your ability to run the arcology. She sighs and lies back, her stiff prick pressed against the underside of her belly, and invites you to ride her cock. You waste no time in mounting her, the feel of <<if $PC.dick >= 1>>your own erection rubbing between your bellies<<else>>the underside of her pregnancy pushing into your own middle<</if>> as she thrusts up into you, driving you wild with lust. It doesn't take long for you to start bucking with orgasm and wrapping your arms around her gravid middle. Her occupants send several kicks your way as she quickens her pace, grabs your hips, and thrusts hard, cumming deep in your pussy. Panting, you slide off her and snuggle up beside her as you catch your breath. "You're looking good after having a child, you know? But obviously you looked even better heavy with my child. I'm keeping those pictures of you close!" she says with a giggle as you rise. With a gentle pat on your bottom, she sends you on your way.
-		<<set $preggoCount++>>
-	<<else>>
-		You arrive once more at the apartment of the heavily pregnant futa, though this time she takes a while to reach the door by the sound of it. When it opens, you are greeted by her usual smile and an octuplets stuffed belly. She grabs your hand and pulls it to her taut middle. "Feel them kick! There's so many of them, it feels amazing!" You wrap your arms around your heavy lover for the evening and help her back to her bed, savoring the weight of her pregnancy. She stops you once she takes a seat and asks "My offer still stands, cutie. I assure you it feels amazing to be so full of babies." You shake your head "no"; being that pregnant would definitely impede your ability to run the arcology and even enjoy your slaves properly. She lies back, before shifting her weight to her side out of discomfort. Her belly is really big, and hangs low enough that reaching her needy cock is quite the challenge; you take a moment to think of a good position to receive her. You take her dick, and gently sliding yourself between her legs, fit it into your pussy. The two of you buck against each other as best you can; a struggle, seeing as you are bearing the weight of her children right now. You have no choice but to wrap your arms around the eagerly kicking mass<<if $PC.dick >= 1>>, trapping your dick between it and yourself,<</if>> as you near your climax. You feel your nethers clamp down as she cums, hard, deep into your pussy. Her children shift under your arms as her water breaks onto you. You quickly untangle yourself and help her to her feet; you can't help but enjoy the feeling of her close contractions under your hand. She points you to her bathroom; "Water birth," she pants, struggling to not give birth where she stands. The tub is already prepared for her, so you help her into it. She refuses to let go of your hand, pleading "Join me?" You take her up on the offer and slide in behind her. You massage her taxed stomach as she struggles to bring her children into the world. A loud moan escapes her lips as the first of her children slips from her pussy and into your waiting hands. Setting her aside, you prepare for the next. After several hours, and a mutual shower, you and her recover together with her eight children; as thanks, you have one milky nipple all to yourself. When it's time to leave, she blows you a kiss and thanks you sincerely for helping her through this.
-		<<set $preggoCount++>>
-=======
 		You arrive at the apartment of the rather moody girl with both sets of functional genitals. What answers the door surprises you; she is extremely pregnant, easily ready to drop. Positioning you over the edge of her bed, she mounts you and begins to enjoy herself. Between the sensations within your pussy, <<if $PC.dick != 0>>your dick's motions against her satin sheets,<</if>>and her belly rubbing up and down your ass and lower back; you quickly tense up in orgasm, prompting her to cum strongly into your pussy. You help her onto her couch and head on your way, but not before she informs you that she'll be waiting to fuck you when you are as pregnant as she is now.
 	<<elseif $preggoCount == 1>>
 		You arrive at the apartment of the heavily pregnant futa. When she answers the door and you are greeted by an even larger belly than last time it becomes abundantly clear that the two of you are on similar reproductive schedules. Noticing your look, she grabs your hands and happily says "Twins!" You wrap your arms around your lover for the evening and help her back to her bed, enjoying the weight of her middle. She stops you once she takes a seat and asks "You know, I have some fertility drugs if you want to get as big as me this time, cutie?" You shake your head "no"; being that pregnant would certainly impede your ability to run the arcology. She sighs and lies back, her stiff prick pressed against the underside of her belly, and invites you to ride her cock. You waste no time in mounting her, the feel of <<if $PC.dick != 0>>your own erection rubbing between your bellies<<else>>the underside of her pregnancy pushing into your own middle<</if>> as she thrusts up into you, driving you wild with lust. It doesn't take long for you to start bucking with orgasm and wrapping your arms around her gravid middle. Her occupants send several kicks your way as she quickens her pace, grabs your hips, and thrusts hard, cumming deep in your pussy. Panting, you slide off her and snuggle up beside her as you catch your breath. "You're looking good after having a child, you know? But obviously you looked even better heavy with my child. I'm keeping those pictures of you close!" she says with a giggle as you rise. With a gentle pat on your bottom, she sends you on your way.
 	<<else>>
 		You arrive once more at the apartment of the heavily pregnant futa, though this time she takes a while to reach the door by the sound of it. When it opens, you are greeted by her usual smile and an octuplets stuffed belly. She grabs your hand and pulls it to her taut middle. "Feel them kick! There's so many of them, it feels amazing!" You wrap your arms around your heavy lover for the evening and help her back to her bed, savoring the weight of her pregnancy. She stops you once she takes a seat and asks "My offer still stands, cutie. I assure you it feels amazing to be so full of babies." You shake your head "no"; being that pregnant would definitely impede your ability to run the arcology and even enjoy your slaves properly. She lies back, before shifting her weight to her side out of discomfort. Her belly is really big, and hangs low enough that reaching her needy cock is quite the challenge; you take a moment to think of a good position to receive her. You take her dick, and gently sliding yourself between her legs, fit it into your pussy. The two of you buck against each other as best you can; a struggle, seeing as you are bearing the weight of her children right now. You have no choice but to wrap your arms around the eagerly kicking mass<<if $PC.dick != 0>>, trapping your dick between it and yourself,<</if>> as you near your climax. You feel your nethers clamp down as she cums, hard, deep into your pussy. Her children shift under your arms as her water breaks onto you. You quickly untangle yourself and help her to her feet; you can't help but enjoy the feeling of her close contractions under your hand. She points you to her bathroom; "Water birth," she pants, struggling to not give birth where she stands. The tub is already prepared for her, so you help her into it. She refuses to let go of your hand, pleading "Join me?" You take her up on the offer and slide in behind her. You massage her taxed stomach as she struggles to bring her children into the world. A loud moan escapes her lips as the first of her children slips from her pussy and into your waiting hands. Setting her aside, you prepare for the next. After several hours, and a mutual shower, you and her recover together with her eight children; as thanks, you have one milky nipple all to yourself. When it's time to leave, she blows you a kiss and thanks you sincerely for helping her through this.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<</if>>
 	<<set $preggoCount++>>
 
diff --git a/src/pregmod/reMaleCitizenHookup.tw b/src/pregmod/reMaleCitizenHookup.tw
index 6082f0d85ab236cc1b6e330dca63aeadb47d896d..fece21d09c58d6f69276b5e41e580cf29222aa25 100644
--- a/src/pregmod/reMaleCitizenHookup.tw
+++ b/src/pregmod/reMaleCitizenHookup.tw
@@ -233,11 +233,7 @@ He's clearly attracted to you; even the most consummate actor would have difficu
 	<<case "Gender Radicalist">>
 		perky fake breasts and a stiff dick as you gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<<case "Gender Fundamentalist">>
-<<<<<<< HEAD
-		a fine body with a proud erection. Before you can tip him onto your bed; he deftly slips you out of your evening dress, scoops you up and places you, back first, at the edge of your bed. He dominantly spears your pussy and begins thrusting powerfully. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly fucking you. You shift in discomfort at being dominated, and in response he <<if $PC.belly >= 5000>>begins massaging your rounded middle<<else>>groping your <<if $PC.boobsBonus > 0>>huge breasts<<elseif $PC.boobsBonus < 0>>cute breasts<<elseif $PC.boobs >= 1>>ample breasts<<else>>butt<</if>><</if>>, distracting you from the situation and allowing you to be overwhelmed by pleasure. With a hard, firm thrust, he cums deep into your pussy. You follow shortly after, feeling the heat of his seed in your depths as you clamp down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you. Through the haze of your lust, you can't help but feel your drink tasted off.
-=======
 		a fine body with a proud erection. Before you can tip him onto your bed; he deftly slips you out of your evening dress, scoops you up and places you, back first, at the edge of your bed. He dominantly spears your pussy and begins thrusting powerfully. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly fucking you. You shift in discomfort at being dominated, and in response he <<if $PC.belly >= 5000>>begins massaging your rounded middle<<else>>groping your <<if $PC.boobs >= 1000>>huge breasts<<elseif $PC.boobs >= 650>>ample breasts<<elseif $PC.boobs >= 300>>cute breasts<<else>>butt<</if>><</if>>, distracting you from the situation and allowing you to be overwhelmed by pleasure. With a hard, firm thrust, he cums deep into your pussy. You follow shortly after, feeling the heat of his seed in your depths as you clamp down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you. Through the haze of your lust, you can't help but feel your drink tasted off.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $PC.forcedFertDrugs += 2>>
 	<<case "Repopulationist">>
 		<<set $PC.forcedFertDrugs += 10>>
@@ -254,11 +250,7 @@ He's clearly attracted to you; even the most consummate actor would have difficu
 		a massive fake bubble butt to go with his extended erection, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, taking as much as you physically can, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<<case "Youth Preferentialist">>
 		<<if $minimumSlaveAge < 13>>
-<<<<<<< HEAD
-			that he is adorable, but may not be satisfying, and gently carry him to your bed. You tease him as you remove your evening dress, crawl next to him, pull him over yourself and guide his tiny penis into you. Instinct quickly takes hold as he begins thrusting and hugs tightly to your <<if $PC.belly >= 5000>>pregnant belly<<else>>larger body<</if>>. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You hold him close and buck against him, trying to make up for his size, until he releases a small load into your depths. You follow not long after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Exhausted, he passes out <<if $PC.belly >= 5000>>against your middle<<elseif $PC.boobsBonus > 0>>in your huge bust<<elseif $PC.boobsBonus < 0>>in your cute breasts<<elseif $PC.boobs >= 1>>in your ample bust<<else>>atop you<</if>>; where he lies until you finish playing with him and move him beside you. You return to your needy crotch to finish up as he snuggles closer to your side.
-=======
 			that he is adorable, but may not be satisfying, and gently carry him to your bed. You tease him as you remove your evening dress, crawl next to him, pull him over yourself and guide his tiny penis into you. Instinct quickly takes hold as he begins thrusting and hugs tightly to your <<if $PC.belly >= 5000>>pregnant belly<<else>>larger body<</if>>. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You hold him close and buck against him, trying to make up for his size, until he releases a small load into your depths. You follow not long after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Exhausted, he passes out <<if $PC.belly >= 5000>>against your middle<<elseif $PC.boobs >= 1000>>in your huge bust<<elseif $PC.boobs >= 650>>in your ample bust<<elseif $PC.boobs >= 300>>in your cute breasts<<else>>atop you<</if>>; where he lies until you finish playing with him and move him beside you. You return to your needy crotch to finish up as he snuggles closer to your side.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<elseif $minimumSlaveAge < 18>>
 			that his whole body looks fresh, untouched, and very young, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 		<<else>>
@@ -326,19 +318,11 @@ He's clearly attracted to you; even the most consummate actor would have difficu
 	<<case "Intellectual Dependency">>
 		a young body eager for sex, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<<case "Slave Professionalism">>
-<<<<<<< HEAD
-		a mature body featuring an erection with years of experience. Before you can tip him onto your bed; he deftly slips you out of your evening dress, scoops you up and places you, back first, at the edge of your bed. He dominantly spears your pussy and begins thrusting, hitting all the right places. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly fucking you. You shift in discomfort at being dominated, and in response he <<if $PC.belly >= 5000>>shifts you to a position more befitting your gravidity<<else>>groping your <<if $PC.boobsBonus > 0>>huge breasts<<elseif $PC.boobsBonus < 0>>cute breasts<<elseif $PC.boobs >= 1>>ample breasts<<else>>butt<</if>><</if>>, calming you and allowing you to give in to the pleasure. With a hard, firm thrust, he cums deep into your pussy. You follow shortly after, feeling the heat of his seed in your depths as you clamp down around his dick. Thankfully, he isn't spent yet and maneuvers you to a fresh position and begins anew, quickly bringing to a second orgasm and drawing an adorable moan out of you. His bag of tricks is nigh endless; you spend the night having sex in new and exciting ways.
-	<<case "Petite Admiration">>
-		that he is adorable, and not lacking at all down there, and gently carry him to your bed. You tease him as you remove your evening dress, crawl next to him and pull him into you. He begins thrusting excitedly and hugs tightly to your <<if $PC.belly >= 5000>>pregnant belly<<else>>larger body<</if>>, clearly into how much bigger you are than him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that spares his tiny form most of the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
-	<<case "Statuesque Glorification">>
-		a glorified titan. Before you can tip him onto your bed; he deftly pulls you out of your evening dress, scoops you up, dominantly spears your pussy and begins thrusting powerfully while holding you. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly fucking you. You <<if $PC.belly >= 5000>>squirm in discomfort until he turns you around and gives your pregnancy room<<elseif $PC.boobsBonus > 0>>squirm in discomfort until he turns you around and uses his other arm to keep your huge breasts steady<<elseif $PC.boobsBonus < 0>>push your cute breasts against his toned abs<<elseif $PC.boobs >= 1>>push your <<if $PC.boobsBonus >= 0>>ample <</if>>breasts against his toned abs<<else>>allow him pull your flat chest to his toned abs<</if>>, before he really takes advantage of your size difference. With a hard, firm thrust, he cums deep into your pussy. You follow shortly after, feeling the heat of his seed in your depths as you clamp down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
-=======
 		a mature body featuring an erection with years of experience. Before you can tip him onto your bed; he deftly slips you out of your evening dress, scoops you up and places you, back first, at the edge of your bed. He dominantly spears your pussy and begins thrusting, hitting all the right places. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly fucking you. You shift in discomfort at being dominated, and in response he <<if $PC.belly >= 5000>>shifts you to a position more befitting your gravidity<<else>>groping your <<if $PC.boobs >= 1000>>huge breasts<<elseif $PC.boobs >= 650>>ample breasts<<elseif $PC.boobs >= 300>>cute breasts<<else>>butt<</if>><</if>>, calming you and allowing you to give in to the pleasure. With a hard, firm thrust, he cums deep into your pussy. You follow shortly after, feeling the heat of his seed in your depths as you clamp down around his dick. Thankfully, he isn't spent yet and maneuvers you to a fresh position and begins anew, quickly bringing to a second orgasm and drawing an adorable moan out of you. His bag of tricks is nigh endless; you spend the night having sex in new and exciting ways.
 	<<case "Petite Admiration">>
 		that he is adorable, and not lacking at all down there, and gently carry him to your bed. You tease him as you remove your evening dress, crawl next to him and pull him into you. He begins thrusting excitedly and hugs tightly to your <<if $PC.belly >= 5000>>pregnant belly<<else>>larger body<</if>>, clearly into how much bigger you are than him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that spares his tiny form most of the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<<case "Statuesque Glorification">>
 		a glorified titan. Before you can tip him onto your bed; he deftly pulls you out of your evening dress, scoops you up, dominantly spears your pussy and begins thrusting powerfully while holding you. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly fucking you. You <<if $PC.belly >= 5000>>squirm in discomfort until he turns you around and gives your pregnancy room<<elseif $PC.boobs >= 1000>>squirm in discomfort until he turns you around and uses his other arm to keep your huge breasts steady<<elseif $PC.boobs >= 650>>push your <<if $PC.boobs >= 900>>ample <</if>>breasts against his toned abs<<elseif $PC.boobs >= 300>>push your cute breasts against his toned abs<</if>>, before he really takes advantage of your size difference. With a hard, firm thrust, he cums deep into your pussy. You follow shortly after, feeling the heat of his seed in your depths as you clamp down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<default>>
 		a hot young body, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft, fully taking its length, before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
 	<</switch>>
diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw
index f454ccb3e75e389eb20bcf0cde0cab9b665c7734..2c6695b81589ba51feb1de62ca2812f906c15477 100644
--- a/src/pregmod/rePregInventor.tw
+++ b/src/pregmod/rePregInventor.tw
@@ -83,22 +83,18 @@
 			<<= VCheck.Vaginal()>>
 		<<elseif $activeSlave.trust < -20>>
 			You then fuck $him, hard, to get your point across, ignoring $his moans of pain and the loud complaints from $his overfilled womb as it barely holds together under your assault. When you finally get bored and
-<<<<<<< HEAD
-			<<if $PC.dick >= 1>>
-=======
 			<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				shoot your load into $his
-					<<if ($activeSlave.vagina >= 10)>>
-						gaping pussy,
-					<<elseif ($activeSlave.vagina > 3)>>
-						loose pussy,
-					<<elseif ($activeSlave.vagina >= 1)>>
-						vagina,
-					<<else>>
-						surprisingly resilient, tight little pussy,
-					<</if>>
-					<<run VCheck.Vaginal()>>
+				<<if ($activeSlave.vagina >= 10)>>
+					gaping pussy,
+				<<elseif ($activeSlave.vagina > 3)>>
+					loose pussy,
+				<<elseif ($activeSlave.vagina >= 1)>>
+					vagina,
+				<<else>>
+					surprisingly resilient, tight little pussy,
+				<</if>>
+				<<run VCheck.Vaginal()>>
 			<<else>>
 				clench your legs around $his slutty head as $he drives your pussy over the edge with $his tongue,
 				<<set $activeSlave.counter.oral++, $oralTotal++>>
@@ -181,11 +177,7 @@
 		<</if>>
 		<<set $activeSlave.counter.oral++, $oralTotal++>>
 		While you're not interested in giving $him the funds necessary to make some of $his more outlandish ideas a reality, you're certainly excited by $his ideas regarding positions and hyperpregnant vaginal play. You tell $him to go for those and $he trills in delight, vibrating $his tongue
-<<<<<<< HEAD
-		<<if $PC.dick >= 1>>
-=======
 		<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			along your dick and sending you over the edge. $He swallows your load, licking $his lips.
 			<<if canTalk($activeSlave)>>
 				"Make <<s>>ure to keep feeding me your cum," $he <<say>>s flirtatiously. "I'm eating for a //lot// more than two, after all."
@@ -678,11 +670,7 @@
 		<br><br>
 		<<if canTalk($activeSlave)>>
 			"Do you like it, <<Master>>?" $he asks. "It'<<s>> built to grow and change a<<s>> your <<s>>lave<<s>> do. It <<sh>>ould be the perfect <<s>>i<<z>>e to <<s>>upport them, no matter what that <<s>>i<<z>>e might be. And if we ever get too big for even that, well..." $he smiles and you realize that, between the feeling of $his heavy, slick mass pressing into you and the rejuvenating effect of the gel,
-<<<<<<< HEAD
-			<<if $PC.dick >= 1>>
-=======
 			<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				you're hard as a rock and
 			<<else>>
 				your pussy is absolutely weeping and you are
@@ -724,11 +712,7 @@
 			"Oh no," $he <<say>>s in mock dismay<<if $activeSlave.skill.combat > 0>>, lowering $his guard<</if>>. "My <<Master>> i<<s>> going to wre<<s>>tle me into <<s>>ubmi<<ss>>ion in thi<<s>> hot, heavy, goo pool. Whatever will I do?"
 		<</if>>
 		You circle around $him, slowly approaching $him, and $he uses the pool's mobility assistance tools to rotate $his body so that $he can just barely keep you in $his gaze, drizzling gel over $his belly as $he keeps it between you and $him to use as a protective barrier. When you're close enough to touch the apex of $his fecund body, you leap forward through the gel, diving to one side and disappearing under it. Your momentum carries you a reasonable distance despite the resistance of the thick substance and you pop back up directly behind $him. You grab $him under $his armpits, pressing your
-<<<<<<< HEAD
-		<<if $PC.dick >= 1>>
-=======
 		<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			rigid dick against $his
 		<<else>>
 			engorged pussy lips against $his
diff --git a/src/pregmod/widgets/playerDescriptionWidgets.tw b/src/pregmod/widgets/playerDescriptionWidgets.tw
index a4cf53dc8f4f36824f2c8d7b4b17bfce802a367e..ebb0010f4e7dade45e544fd2a92f3a9e2e796c40 100644
--- a/src/pregmod/widgets/playerDescriptionWidgets.tw
+++ b/src/pregmod/widgets/playerDescriptionWidgets.tw
@@ -90,13 +90,8 @@
 		<<elseif $PC.markings == "heavily freckled">>
 			They are covered in freckles, which are particularly dense in the cleft between them.
 		<</if>>
-<<<<<<< HEAD
-	<<elseif $PC.boobs >= 1>>
-		you have a @@.orange;healthy pair of DD-cup breasts.@@ They are nice, perky and jiggle pleasantly with your every move.
-=======
 	<<elseif $PC.boobs >= 300>>
 		you have a @@.orange;tiny pair of A-cup breasts.@@ They are nice and perky, but that's about it.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<if $PC.lactation > 0>>
 			They feel a bit bigger lately; this is likely a side effect of your lactation.
 		<</if>>
@@ -128,36 +123,6 @@
 	<</if>>
 <<elseif _passage == "Economics">>
 	<<if $PC.career == "servant">>
-<<<<<<< HEAD
-		<<if $PC.boobs >= 1 && $PC.boobsBonus > 0>>
-			<<if $PC.boobsBonus > 2>>
-				You've gotten your dress let out to accommodate your huge bust.
-			<<elseif $PC.boobsBonus == 2>>
-				Your dress bulges with your big breasts.
-			<<elseif $PC.boobsBonus == 1>>
-				Your dress feels tight around your breasts.
-			<</if>>
-		<</if>>
-	<<elseif $PC.career == "escort">>
-		<<if $PC.boobs >= 1 && $PC.boobsBonus > 0>>
-			<<if $PC.boobsBonus > 2>>
-				Your top strains as it struggles to cover your nipples, letting your huge<<if $PC.markings == "freckles">>, freckled<<elseif $PC.markings == "heavily freckled">>, densely freckled<</if>> bust bulge lewdly around it.
-			<<elseif $PC.boobsBonus == 2>>
-				Your top can barely contain your big<<if $PC.markings == "freckles">>, freckled<<elseif $PC.markings == "heavily freckled">>, heavily freckled<</if>> breasts, leaving you looking sluttier than ever.
-			<<elseif $PC.boobsBonus == 1>>
-				Your breasts spill over your slutty top<<if $PC.markings == "freckles">>, showing off your freckled cleavage<<elseif $PC.markings == "heavily freckled">>, freckle packed cleavage<</if>>.
-			<</if>>
-		<</if>>
-	<<else>>
-		<<if $PC.boobs >= 1 && $PC.boobsBonus > 0>>
-			<<if $PC.boobsBonus > 2>>
-				You've gotten your top retailored to fit your huge bust.
-			<<elseif $PC.boobsBonus == 2>>
-				Your top strains against your big breasts<<if $PC.markings == "freckles">>, revealing a peak of freckled cleavage<<elseif $PC.markings == "heavily freckled">>, revealing a peak of densely freckled cleavage<</if>>.
-			<<elseif $PC.boobsBonus == 1>>
-				Your top feels tight around your breasts.
-			<</if>>
-=======
 		<<if $PC.boobs >= 1400>>
 			You've gotten your dress let out to accommodate your huge bust.
 		<<elseif $PC.boobs >= 1200>>
@@ -180,7 +145,6 @@
 			Your top strains against your big breasts<<if $PC.markings == "freckles">>, revealing a peak of freckled cleavage<<elseif $PC.markings == "heavily freckled">>, revealing a peak of densely freckled cleavage<</if>>.
 		<<elseif $PC.boobs >= 1000>>
 			Your top feels tight around your breasts.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<</if>>
 	<</if>>
 <<else>>
@@ -310,11 +274,7 @@
 <<if _passage == "Manage Personal Affairs">>
 	<<if $PC.preg > 0>>
 		<<if $PC.belly >= 120000>>
-<<<<<<< HEAD
-			@@.red;Your belly is coated with stretch marks and is taut as a drum; you don't know how much more your poor womb can endure.@@ You can barely even leave your bed without a helping hand. Kicks can almost constantly be seen dotting its surface. You give it a pat for good measure, only encouraging your <<print pregNumberName($PC.pregType, 2)>> to squirm in excitement.<<if $PC.dick >= 1>> You watch as your dick hardens from the prostate stimulation; you steady yourself for the coming orgasm.<</if>>
-=======
 			@@.red;Your belly is coated with stretch marks and is taut as a drum; you don't know how much more your poor womb can endure.@@ You can barely even leave your bed without a helping hand. Kicks can almost constantly be seen dotting its surface. You give it a pat for good measure, only encouraging your <<print pregNumberName($PC.pregType, 2)>> to squirm in excitement.<<if $PC.dick != 0>> You watch as your dick hardens from the prostate stimulation; you steady yourself for the coming orgasm.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<elseif $PC.belly >= 105000>>
 			You have trouble getting up and sitting down. Even standing while supporting your @@.orange;massive belly@@ has become an exhausting endeavor.
 		<<elseif $PC.belly >= 90000>>
@@ -366,11 +326,7 @@
 	<<if $PC.career == "servant">>
 		<<if $PC.preg > 0>>
 			<<if $PC.belly >= 120000>>
-<<<<<<< HEAD
-				You don't know how much more you can take. You feel so full and your children never calm down. You swear they take shifts tormenting your poor bladder. Even worse, your pregnancy juts out over a half-<<if $showInches == 2>>yard<<else>>meter<</if>> from your front and has soundly defeated the seams of your dress<<if $PC.dick >= 1>>. Occasionally one of the bottoms manages to land a series of hits to your prostate, not that you mind as much, save for when they keep at it and you can't restrain your orgasm<</if>>.
-=======
 				You don't know how much more you can take. You feel so full and your children never calm down. You swear they take shifts tormenting your poor bladder. Even worse, your pregnancy juts out over a half-<<if $showInches == 2>>yard<<else>>meter<</if>> from your front and has soundly defeated the seams of your dress<<if $PC.dick != 0>>. Occasionally one of the bottoms manages to land a series of hits to your prostate, not that you mind as much, save for when they keep at it and you can't restrain your orgasm<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<elseif $PC.belly >= 105000>>
 				You can barely function any more. You're so big and heavy that even the simplest of actions requires both intense effort and thought just to get it done. Your frumpy dress is also at its limit, and much to your annoyance, your children will not stay still enough to let you fix it.
 			<<elseif $PC.belly >= 90000>>
@@ -437,11 +393,7 @@
 	<<elseif $PC.career == "escort">>
 		<<if $PC.preg > 0>>
 			<<if $PC.belly >= 120000>>
-<<<<<<< HEAD
-				You don't know how much more you can take. You feel so full and your children never calm down. You swear they take shifts tormenting your poor bladder. Even worse, your pregnancy juts out over a half-<<if $showInches == 2>>yard<<else>>meter<</if>> from your front and has seized control as your dominant aspect<<if $PC.dick >= 1>>. Occasionally one of the bottoms manages to land a series of hits to your prostate, not that you mind as much. It's good for business when you orgasm lewdly and cum your bottoms<</if>>.
-=======
 				You don't know how much more you can take. You feel so full and your children never calm down. You swear they take shifts tormenting your poor bladder. Even worse, your pregnancy juts out over a half-<<if $showInches == 2>>yard<<else>>meter<</if>> from your front and has seized control as your dominant aspect<<if $PC.dick != 0>>. Occasionally one of the bottoms manages to land a series of hits to your prostate, not that you mind as much. It's good for business when you orgasm lewdly and cum your bottoms<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<elseif $PC.belly >= 105000>>
 				You can barely function any more. You're so big and heavy that even the simplest of actions requires both intense effort and thought just to get it done. None of your poses work with your gravid body either, and you're practically popping out of your skimpiest outfit.
 			<<elseif $PC.belly >= 90000>>
@@ -524,11 +476,7 @@
 	<<else>>
 		<<if $PC.preg > 0>>
 			<<if $PC.belly >= 120000>>
-<<<<<<< HEAD
-				You don't know how much more you can take. You feel so full and your children never calm down. You swear they take shifts tormenting your poor bladder. Even worse, your pregnancy juts out over a half-<<if $showInches == 2>>yard<<else>>meter<</if>> from your front and has soundly defeated your maternity suit<<if $PC.dick >= 1>>. Occasionally one of the bottoms manages to land a series of hits to your prostate, not that you mind as much, save for when they keep at it and you a can't restrain your orgasm. The last thing you want to do in a meeting is spontaneously orgasm and cum your in clothes<</if>>.
-=======
 				You don't know how much more you can take. You feel so full and your children never calm down. You swear they take shifts tormenting your poor bladder. Even worse, your pregnancy juts out over a half-<<if $showInches == 2>>yard<<else>>meter<</if>> from your front and has soundly defeated your maternity suit<<if $PC.dick != 0>>. Occasionally one of the bottoms manages to land a series of hits to your prostate, not that you mind as much, save for when they keep at it and you a can't restrain your orgasm. The last thing you want to do in a meeting is spontaneously orgasm and cum your in clothes<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<elseif $PC.belly >= 105000>>
 				You can barely function any more. You're so big and heavy that even the simplest of actions requires both intense effort and thought just to get it done. Your suit buttons keep popping, and much to your annoyance, your child<<if $PC.pregType > 1>>ren<</if>> will not stay still enough to let you redo them.
 			<<elseif $PC.belly >= 90000>>
@@ -614,11 +562,7 @@
 <<else>>
 	<<if $PC.preg > 0>>
 		<<if $PC.belly >= 120000>>
-<<<<<<< HEAD
-			Your belly is coated with stretch marks and is taut as a drum; you don't know how much more your poor womb can endure. Kicks can almost constantly be seen dotting its surface. You give it a pat for good measure, only encouraging your <<print pregNumberName($PC.pregType, 2)>> to squirm in excitement.<<if $PC.dick >= 1>> As your dick hardens under the prostate stimulation, you call for a slave to receive the incoming load.<</if>>
-=======
 			Your belly is coated with stretch marks and is taut as a drum; you don't know how much more your poor womb can endure. Kicks can almost constantly be seen dotting its surface. You give it a pat for good measure, only encouraging your <<print pregNumberName($PC.pregType, 2)>> to squirm in excitement.<<if $PC.dick != 0>> As your dick hardens under the prostate stimulation, you call for a slave to receive the incoming load.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<elseif $PC.belly >= 105000>>
 			Getting out of your chair is practically a dream at this point. It takes far too much effort to do it on your own and is a little embarrassing to ask help with.
 		<<elseif $PC.belly >= 90000>>
@@ -720,11 +664,7 @@
 		<<else>>
 			@@.lime;tight vagina.@@ You're no virgin, but you've taken care of yourself.
 		<</if>>
-<<<<<<< HEAD
-	<<elseif $PC.dick >= 1>>
-=======
 	<<elseif $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		an @@.orange;above average penis@@
 		<<if $PC.balls >= 14>>
 			that is constantly streaming precum,
@@ -924,17 +864,10 @@
 			<</if>>
 		<</if>>
 	<<else>>
-<<<<<<< HEAD
-		<<if $PC.dick >= 1>>
-			<<if $PC.ballsImplant > 3>>
-				<<if $PC.butt > 2>>
-					<<if $PC.buttImplant == 1>>
-=======
 		<<if $PC.dick != 0>>
 			<<if $PC.balls >= 30>>
 				<<if $PC.butt >= 5>>
 					<<if $PC.buttImplant >= 1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 						Your custom kilt is also forced to stretch around your enormous rear, making the implants pretty obvious. With both your front and back struggling to get free of the restrictive cloth, it isn't unusual for one or the other to peek out.
 					<<else>>
 						Your custom kilt is also forced to stretch around your enormous rear, and bending over is basically asking for it to ride up all the way to your hips. With both your front and back struggling to get free of the restrictive cloth, it isn't unusual for one or the other to peek out.
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index af55eb5c6a7b298f2dfac9a1c8bc6a5208a9238e..185afec5379654497c3aab35a42a5cdbef469248 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -515,11 +515,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <br><<link "$He's more important">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-	You shift to stand behind $him, your <<if $PC.boobs >= 1>>breasts soft and sensual<<else>>chest hard and masculine<</if>> but not insistently sexual against $his <<if $activeSlave.muscles > 30>>muscular<<elseif $activeSlave.weight > 10>>soft<<else>>warm<</if>> back. You wrap your arms around $him, over $his own, each of your <<if $PC.title == 1>>strong<<else>>feminine<</if>> hands finding and clasping one of $hers.<<if $activeSlave.boobs > 3000>> $His incredible boobs rest heavily over the top of both of your arms.<</if>> $He knows you very well, and shifts $his torso ever so slightly from side to side, snuggling in a little closer to you to let you know $he's comfortable and available without being demanding or needy. You speak quietly, your voice a reassuring <<if $PC.boobs == 0>>rumble<<else>>hum<</if>> $he feels against $his back<<if canHear($activeSlave)>> as well as hears<</if>>. You let $him know that $he has a place with you, and $he always will. You let $him know that you're worried too, and that you don't know what the future will bring. But you do know that $he'll be by your side as you meet it. A silent shake in the pretty <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>> you've got in your arms is your only indication that @@.mediumaquamarine;$he's crying a little@@ as $he whispers, "Thank you, <<Master>>. I'll do my be<<s>>t."
-=======
 	You shift to stand behind $him, your <<if $PC.boobs >= 300>>breasts <<if $PC.boobsImplant > 0>>firm<<else>>soft<</if>> and sensual<<else>>chest hard and masculine<</if>> but not insistently sexual against $his <<if $activeSlave.muscles > 30>>muscular<<elseif $activeSlave.weight > 10>>soft<<else>>warm<</if>> back. You wrap your arms around $him, over $his own, each of your <<if $PC.title == 1>>strong<<else>>feminine<</if>> hands finding and clasping one of $hers.<<if $activeSlave.boobs > 3000>> $His incredible boobs rest heavily over the top of both of your arms.<</if>> $He knows you very well, and shifts $his torso ever so slightly from side to side, snuggling in a little closer to you to let you know $he's comfortable and available without being demanding or needy. You speak quietly, your voice a reassuring <<if $PC.boobs == 0>>rumble<<else>>hum<</if>> $he feels against $his back<<if canHear($activeSlave)>> as well as hears<</if>>. You let $him know that $he has a place with you, and $he always will. You let $him know that you're worried too, and that you don't know what the future will bring. But you do know that $he'll be by your side as you meet it. A silent shake in the pretty <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>> you've got in your arms is your only indication that @@.mediumaquamarine;$he's crying a little@@ as $he whispers, "Thank you, <<Master>>. I'll do my be<<s>>t."
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<set $activeSlave.trust += 5>>
 	<</replace>>
 <</link>>
@@ -624,15 +620,9 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <<link "Fuck $him">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-	You stand up, and from the look on your face, $he knows it's $his turn to get fucked. $He <<if $activeSlave.fetish == "dom">>visibly shelves $his dominance<<elseif $activeSlave.fetish == "sadist">>visibly lets $his sadism go<<else>>softens visibly<</if>>, looking relieved to be able to let someone else lead. You give $him a lustful kiss on the lips and then reach down, taking hold of $his thigh and spinning $him around, raising $his leg so $his foot's on the arm of the couch. <<if $PC.dick >= 1>>You slide your dick<<else>>$He reaches under $himself and back to stroke your pussy as you press your hips against $him, and you slide your fingers<</if>> inside $his <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>>. $He groans with discomfort as $his overtaxed dick tries and fails to become hard again, but relaxes as <<if $PC.dick >= 1>>cockhead<<else>>fingertips<</if>> stimulate the most sensitive place inside $him, producing arousal that obscures the soreness. You hold $him close, <<if $PC.dick >= 1>>one<<else>>your free<</if>> arm <<if $activeSlave.boobs > 4000>>cradling one of $his udders<<elseif $activeSlave.boobs > 1000>>hefting one of $his heavy breasts<<elseif $activeSlave.boobs > 400>>holding one of $his boobs<<else>>cupped over one of $his $activeSlave.nipples nipples<</if>> and hugging $him against your <<if $PC.boobs >= 1>>bosom<<else>>hard chest<</if>>. $He pants exhaustedly in your arms as you take $him, and when $he climaxes, $he manages only a weak ejaculation onto the couch. You have mercy and fuck $him harder, bringing yourself to a quicker orgasm and letting $him fall into $his own mess. "I @@.hotpink;love you,@@
-	<<Master>>," $he mumbles into the cushions.
-	<<if $PC.dick >= 1>>
-=======
 	You stand up, and from the look on your face, $he knows it's $his turn to get fucked. $He <<if $activeSlave.fetish == "dom">>visibly shelves $his dominance<<elseif $activeSlave.fetish == "sadist">>visibly lets $his sadism go<<else>>softens visibly<</if>>, looking relieved to be able to let someone else lead. You give $him a lustful kiss on the lips and then reach down, taking hold of $his thigh and spinning $him around, raising $his leg so $his foot's on the arm of the couch. <<if $PC.dick != 0>>You slide your dick<<else>>$He reaches under $himself and back to stroke your pussy as you press your hips against $him, and you slide your fingers<</if>> inside $his <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>>. $He groans with discomfort as $his overtaxed dick tries and fails to become hard again, but relaxes as <<if $PC.dick != 0>>cockhead<<else>>fingertips<</if>> stimulate the most sensitive place inside $him, producing arousal that obscures the soreness. You hold $him close, <<if $PC.dick != 0>>one<<else>>your free<</if>> arm <<if $activeSlave.boobs > 4000>>cradling one of $his udders<<elseif $activeSlave.boobs > 1000>>hefting one of $his heavy breasts<<elseif $activeSlave.boobs > 400>>holding one of $his boobs<<else>>cupped over one of $his $activeSlave.nipples nipples<</if>> and hugging $him against your <<if $PC.boobs >= 300>>bosom<<else>>hard chest<</if>>. $He pants exhaustedly in your arms as you take $him, and when $he climaxes, $he manages only a weak ejaculation onto the couch. You have mercy and fuck $him harder, bringing yourself to a quicker orgasm and letting $him fall into $his own mess. "I @@.hotpink;love you,@@
 	<<Master>>," $he mumbles into the cushions.
 	<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		Your cum glistens as it begins to drip out of $his <<if canDoVaginal($activeSlave)>>well-fucked pussy<<else>>loosened asshole, which tightens and relaxes a little with $his breathing<</if>>.
 	<<else>>
 		<<if canDoVaginal($activeSlave)>>
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index 49b75ddf31a7bd786fb4c93d8a37f15f6d86c09c..1eb786415a9768595093d3f9a68bf53403c6d27f 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -161,11 +161,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 		<<replace "#result">>
 		You shove $activeSlave.slaveName hard, forcing a surprised shriek out of $him as $he crashes forward into $subSlave.slaveName's <<if $subSlave.boobs > 2000>>helpfully pillowlike bosom<<elseif $subSlave.boobs > 500>>healthy tits<<else>>chest<</if>>, and then ram your pelvis up against $him, pinning $him against $his patient. $subSlave.slaveName's eyelids flicker, but _he2 does not wake up, despite your assault <<if canPenetrate($activeSlave)>>shoving $activeSlave.slaveName's cock as far up _his2 asshole as it will go<<else>>trapping $activeSlave.slaveName's hands between them and pushing $his fingers even farther up $subSlave.slaveName's asshole<</if>>. $activeSlave.slaveName tries to shift a little, but receives a peremptory push back to where $he was. $He realizes $he's to lie still and take what's coming to $him, and $he does $his best to relax.
 		<br><br>
-<<<<<<< HEAD
-		<<if $PC.dick >= 1>>
-=======
 		<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if canDoVaginal($activeSlave)>>
 				<<if $activeSlave.vagina > 2>>
 					$His roomy cunt takes your brutal thrusting without trouble. To communicate your message, $he needs to be uncomfortable, so you deliberately force $him down farther and fuck $him at an awkward angle. Your harsh pounding begins to force groans out of $him.
@@ -377,11 +373,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 <br><<link "Leave the matter between the Attendant and the slave $he's helping">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-	You let $activeSlave.slaveName deal with $subSlave.slaveName's troubles; after a short time $he sends $subSlave.slaveName off to shower, and submerges, swimming over to you under the water. $He pokes out of the water, comically letting a huge mouthful of the warm, healthy mineral water run out of $his mouth in a stream before giggling at $himself and smiling at you. "<<Master>>, would you like me to tell you about $subSlave.slaveName?" $he asks. You shake your head, and tell $him no, you trust $him to do $his best to heal anything that ails $his charges. $He looks at you with huge <<= App.Desc.eyeColor($activeSlave)>> eyes for a long moment before throwing $his <<if ($activeSlave.weight > 10)>>plush<<else>>taut<</if>> body into your arms. $He looks up at you and asks incredulously, "<<Master>>, you trust me?" You nod. $He looks shocked but kisses you and drops back down under the water. You feel the lovely sensation of $his <<if ($activeSlave.lips > 70)>>massive<<elseif ($activeSlave.lips > 40)>>pillowlike<<else>>nice<</if>> lips <<if ($PC.vagina >= 1)>>nibbling their way up towards your clit<<else>>forming a seal around your dickhead<</if>>, and although $he has to come up periodically for air, $he gives you quite a @@.hotpink;loving@@ blowjob.
-=======
 	You let $activeSlave.slaveName deal with $subSlave.slaveName's troubles; after a short time $he sends $subSlave.slaveName off to shower, and submerges, swimming over to you under the water. $He pokes out of the water, comically letting a huge mouthful of the warm, healthy mineral water run out of $his mouth in a stream before giggling at $himself and smiling at you. "<<Master>>, would you like me to tell you about $subSlave.slaveName?" $he asks. You shake your head, and tell $him no, you trust $him to do $his best to heal anything that ails $his charges. $He looks at you with huge <<= App.Desc.eyesColor($activeSlave)>> for a long moment before throwing $his <<if ($activeSlave.weight > 10)>>plush<<else>>taut<</if>> body into your arms. $He looks up at you and asks incredulously, "<<Master>>, you trust me?" You nod. $He looks shocked but kisses you and drops back down under the water. You feel the lovely sensation of $his <<if ($activeSlave.lips > 70)>>massive<<elseif ($activeSlave.lips > 40)>>pillowlike<<else>>nice<</if>> lips <<if ($PC.vagina != -1)>>nibbling their way up towards your clit<<else>>forming a seal around your dickhead<</if>>, and although $he has to come up periodically for air, $he gives you quite a @@.hotpink;loving@@ blowjob.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<set $activeSlave.devotion += 10>>
 	<</replace>>
 <</link>>
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index 7d2552decff5b6ff4a0339b054fbaf20e493d9e1..be5ca0ab20cd8025c3acd1c5108463c463832d74 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -93,11 +93,7 @@ There's no other way to describe what $he's doing: the $desc has $his back to th
 <<else>>
 	got $his hips cocked to spread $his sleek butt and
 <</if>>
-<<<<<<< HEAD
-reveal $his backdoor. Your slaves are trained to check themselves daily, but $he seems fascinated. As you pause to watch, $he begins to clench and relax $his <<if $activeSlave.anus > 2>>loose<<else>>cute<</if>> hole, <<if ($activeSlave.analArea - $activeSlave.anus) > 1>> lewdly flexing<<else>>alternately puckering and relaxing<</if>> the $skinDesc skin around it. $He giggles self-consciously at the sight, and then relaxes all the way, causing $his asspussy to open into a <<if $activeSlave.anus > 2>><<if $PC.dick >= 1>>cock<<else>>dildo<</if>>-hungry<<else>>slight<</if>> gape. $He notices you out of the corner of $his eye and
-=======
 reveal $his backdoor. Your slaves are trained to check themselves daily, but $he seems fascinated. As you pause to watch, $he begins to clench and relax $his <<if $activeSlave.anus > 2>>loose<<else>>cute<</if>> hole, <<if ($activeSlave.analArea - $activeSlave.anus) > 1>> lewdly flexing<<else>>alternately puckering and relaxing<</if>> the $skinDesc skin around it. $He giggles self-consciously at the sight, and then relaxes all the way, causing $his asspussy to open into a <<if $activeSlave.anus > 2>><<if $PC.dick != 0>>cock<<else>>dildo<</if>>-hungry<<else>>slight<</if>> gape. $He notices you out of the corner of $his eye and
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 <<if $activeSlave.butt > 6>>
 	releases $his grip on $his heavy buttocks to turn and greet you, letting them clap gently together and conceal $his asshole again.
 <<elseif $activeSlave.butt > 3>>
@@ -118,11 +114,7 @@ reveal $his backdoor. Your slaves are trained to check themselves daily, but $he
 	The huge area of $skinDesc anus around $his actual hole certainly draws the eye towards its center, though the way $he's using $his sphincter as a come-on does enhance the effect.
 <</if>>
 <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>
-<<<<<<< HEAD
-	"Plea<<s>>e, <<Master>>," $he begins to beg. "I can't wait to feel <<if $PC.dick >= 1>>your cock<<else>>you<</if>> in<<s>>ide me."
-=======
 	"Plea<<s>>e, <<Master>>," $he begins to beg. "I can't wait to feel <<if $PC.dick != 0>>your cock<<else>>you<</if>> in<<s>>ide me."
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 <<else>>
 	"Plea<<s>>e, <<Master>>," $he <<say>>s. "U<<s>>e me."
 <</if>>
@@ -341,11 +333,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 			<</if>>
 			$HeadGirl.slaveName guides _his2 <<if !canPenetrate($HeadGirl)>>strap-on<<else>>cock<</if>> inside the <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>enthusiastic<<else>>compliant<</if>> $activeSlave.slaveName, who begins to ride it, enjoying both the <<if $activeSlave.dick > 0>>prostate<<else>>anal<</if>> stimulation and the feeling of $his <<if $activeSlave.dick > 0>><<if ($activeSlave.hormoneBalance >= 100) || ($activeSlave.chastityPenis == 1)>>midsection trapped between $him and <<elseif ($activeSlave.hormoneBalance >= 100) || ($activeSlave.balls == 0) || ($activeSlave.ballType == "sterile")>>soft dick trapped between $him and <<else>>erection trapped between $him and <</if>><<else>>pussy pressed against<</if>> $HeadGirl.slaveName. $HeadGirl.slaveName smacks the humping <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>>'s butt to get $him to stop, and slides an index finger up $his ass alongside the <<if !canPenetrate($HeadGirl)>>phallus<<else>>cock<</if>>. $activeSlave.slaveName shudders, and then begins to whine as $HeadGirl.slaveName pulls $his sphincter wider.
 			<br><br>
-<<<<<<< HEAD
-			"Plea<<s>>e," the slave begs incoherently as you press your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>> against $HeadGirl.slaveName's finger. It's not clear whether $he's begging you to DP $his anus, or begging you not to, but whichever it is, $HeadGirl.slaveName withdraws _his2 finger and you shove yourself inside. $activeSlave.slaveName jerks with discomfort and gives a gasping "Oh f-fuck-k" that <<if $activeSlave.anus > 2>>$he repeats over and over<<else>>is followed by some minor struggling<</if>> as you begin to fuck $him. From _his2 angle, $HeadGirl.slaveName can't pound $activeSlave.slaveName quite as hard as you can, but _he2 does _his2 best. When you've both had your fun, extracted yourselves, and let the exhausted, gaped bitch collapse onto the floor, $HeadGirl.slaveName gives you a naughty wink.
-=======
 			"Plea<<s>>e," the slave begs incoherently as you press your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> against $HeadGirl.slaveName's finger. It's not clear whether $he's begging you to DP $his anus, or begging you not to, but whichever it is, $HeadGirl.slaveName withdraws _his2 finger and you shove yourself inside. $activeSlave.slaveName jerks with discomfort and gives a gasping "Oh f-fuck-k" that <<if $activeSlave.anus > 2>>$he repeats over and over<<else>>is followed by some minor struggling<</if>> as you begin to fuck $him. From _his2 angle, $HeadGirl.slaveName can't pound $activeSlave.slaveName quite as hard as you can, but _he2 does _his2 best. When you've both had your fun, extracted yourselves, and let the exhausted, gaped bitch collapse onto the floor, $HeadGirl.slaveName gives you a naughty wink.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<run Enunciate($HeadGirl)>>
 			"@@.hotpink;That wa<<s>> fun,@@ <<Master>>!" _he2 <<say>>s. "<<Sh>>all we flip $him over and go again?"
 			<<run Enunciate($activeSlave)>>
@@ -435,11 +423,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 <<link "Love $him back">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-	You swing your legs up onto your desk and jump up onto its smooth surface, $his eyes tracking the <<if $PC.boobs >= 1>>way it makes your breasts move<<else>>powerful way your muscles move your body<</if>>. When you pat the tops of your <<if $PC.title == 1>>hard<<else>>soft<</if>> thighs meaningfully, $he giggles happily and skips forward to clamber up and sit on your lap. The bouncing and climbing creates quite a nice spectacle of jiggling tits and waving cock, and $he manages to get up on the desk in such a way that you get a solid eyeful of first $his wet pussy and then $his ready anus. $He settles $himself onto your lap with a coo, feeling the <<if $PC.dick >= 1>>hardness of your erection <<if $PC.vagina >= 1>>and the warmth further down<</if>><<else>>warmth of your arousal<</if>> against $his hermaphroditic genitalia. $He starts to grind $himself lasciviously against you, but stops when you seize $his face and kiss $him deeply. $He moans back into you, returning the kiss with intensity. <<if $activeSlave.boobs > 4000>>$His udders are so huge the two of you have to press your torsos hard together to make out, a delightful struggle that stimulates $his nipples quite a lot, to go by the way $he squeaks and giggles into your mouth.<<elseif $activeSlave.boobs > 2000>>$His bosom is are so big that making out face to face presses it quite hard between your torsos, which stimulates $his nipples quite a lot, to go by the way $he squeaks and giggles into your mouth.<<elseif $PC.boobs >= 1>>You undress without breaking your lip lock, bringing your bare breasts against $hers in a warm, loving embrace.<<else>>You strip without breaking your lip lock, bringing your heavily muscled chest against $his soft breasts in a tender, loving embrace.<</if>> $His arousal builds rapidly and $he goes back to grinding, <<if $PC.dick >= 1>>eventually getting $himself so hot that your dick slides into $him almost without either of you meaning to make it happen. $He climaxes with you shortly, cumming all over $his own breasts.<<else>>bringing you both to a shaking climax. $He cums all over $his own breasts, coating them in glistening ejaculate.<</if>> As $he relaxes back against the desk, $his panting making $his cum-glazed tits rise and fall, you reflect that you just lied by omission, letting a pretty $girl maintain $his delusions and @@.hotpink;$his love for you.@@ Of all your sins, this is perhaps the smallest.
-=======
 	You swing your legs up onto your desk and jump up onto its smooth surface, $his eyes tracking the <<if $PC.boobs >= 300>>way it makes your breasts move<<else>>powerful way your muscles move your body<</if>>. When you pat the tops of your <<if $PC.title == 1>>hard<<else>>soft<</if>> thighs meaningfully, $he giggles happily and skips forward to clamber up and sit on your lap. The bouncing and climbing creates quite a nice spectacle of jiggling tits and waving cock, and $he manages to get up on the desk in such a way that you get a solid eyeful of first $his wet pussy and then $his ready anus. $He settles $himself onto your lap with a coo, feeling the <<if $PC.dick != 0>>hardness of your erection <<if $PC.vagina != -1>>and the warmth further down<</if>><<else>>warmth of your arousal<</if>> against $his hermaphroditic genitalia. $He starts to grind $himself lasciviously against you, but stops when you seize $his face and kiss $him deeply. $He moans back into you, returning the kiss with intensity. <<if $activeSlave.boobs > 4000>>$His udders are so huge the two of you have to press your torsos hard together to make out, a delightful struggle that stimulates $his nipples quite a lot, to go by the way $he squeaks and giggles into your mouth.<<elseif $activeSlave.boobs > 2000>>$His bosom is are so big that making out face to face presses it quite hard between your torsos, which stimulates $his nipples quite a lot, to go by the way $he squeaks and giggles into your mouth.<<elseif $PC.boobs >= 300 || $PC.title == 0>>You undress without breaking your lip lock, bringing your bare breasts against $hers in a warm, loving embrace.<<else>>You strip without breaking your lip lock, bringing your heavily muscled chest against $his soft breasts in a tender, loving embrace.<</if>> $His arousal builds rapidly and $he goes back to grinding, <<if $PC.dick != 0>>eventually getting $himself so hot that your dick slides into $him almost without either of you meaning to make it happen. $He climaxes with you shortly, cumming all over $his own breasts.<<else>>bringing you both to a shaking climax. $He cums all over $his own breasts, coating them in glistening ejaculate.<</if>> As $he relaxes back against the desk, $his panting making $his cum-glazed tits rise and fall, you reflect that you just lied by omission, letting a pretty $girl maintain $his delusions and @@.hotpink;$his love for you.@@ Of all your sins, this is perhaps the smallest.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<set $activeSlave.devotion += 4>>
 	<<set $activeSlave.counter.vaginal += 1>>
 	<<set $vaginalTotal += 1>>
@@ -448,11 +432,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 <br><<link "Break $him with the truth">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-	You point at the couch, and $he skips over to it with a giggle, boobs bouncing. $He hops up onto the cushions, kneeling with $his butt stuck out invitingly and $his torso bent over its back. $He reaches around to pull one <<if ($activeSlave.butt > 5)>>massive<<elseif ($activeSlave.butt > 2)>>heavy<<else>>cute<</if>> buttock to one side, <<if $activeSlave.anus > 2>>stretching $his lewd backdoor into a gape<<elseif $activeSlave.anus > 1>>stretching $his backdoor lewdly<<else>>highlighting $his tight anus<</if>> and showing off $his <<if $activeSlave.labia > 1>>dangling<<elseif $activeSlave.labia > 0>>generous<<else>>wet<</if>> pussylips. You enter $him from behind, your <<if $PC.dick >= 1>>turgid dick<<else>>strap-on<</if>> sliding easily into $his cunt. Your hands slide around $him to hold $his shoulders in a gentle lock, and you whisper secrets into $his ear. You tell $him that the Futanari Sisters here failed because you undermined them. You tell $him that $he is a slave because you planned and executed $his enslavement. And you tell $him that no slave will believe $him if $he tells them the truth, since they love you just like $he did. As you pour this poison into $him, $he remains perfectly still, processing the revelation; the only clue to $his feelings is $his rapidly softening cock. When it has become completely, pathetically limp, a huge sob tears its way out of $him. You switch to $his anus and assrape $him without mercy, forcing $his limp torso halfway around so you can press a kiss on $his bawling mouth. $He does not resist, even when you begin to taste the salt tears that stream down $his pretty face. $He will remain devoted to you, mostly from a lack of alternatives, but $his trust in you has @@.gold;suffered immensely.@@
-=======
 	You point at the couch, and $he skips over to it with a giggle, boobs bouncing. $He hops up onto the cushions, kneeling with $his butt stuck out invitingly and $his torso bent over its back. $He reaches around to pull one <<if ($activeSlave.butt > 5)>>massive<<elseif ($activeSlave.butt > 2)>>heavy<<else>>cute<</if>> buttock to one side, <<if $activeSlave.anus > 2>>stretching $his lewd backdoor into a gape<<elseif $activeSlave.anus > 1>>stretching $his backdoor lewdly<<else>>highlighting $his tight anus<</if>> and showing off $his <<if $activeSlave.labia > 1>>dangling<<elseif $activeSlave.labia > 0>>generous<<else>>wet<</if>> pussylips. You enter $him from behind, your <<if $PC.dick != 0>>turgid dick<<else>>strap-on<</if>> sliding easily into $his cunt. Your hands slide around $him to hold $his shoulders in a gentle lock, and you whisper secrets into $his ear. You tell $him that the Futanari Sisters here failed because you undermined them. You tell $him that $he is a slave because you planned and executed $his enslavement. And you tell $him that no slave will believe $him if $he tells them the truth, since they love you just like $he did. As you pour this poison into $him, $he remains perfectly still, processing the revelation; the only clue to $his feelings is $his rapidly softening cock. When it has become completely, pathetically limp, a huge sob tears its way out of $him. You switch to $his anus and assrape $him without mercy, forcing $his limp torso halfway around so you can press a kiss on $his bawling mouth. $He does not resist, even when you begin to taste the salt tears that stream down $his pretty face. $He will remain devoted to you, mostly from a lack of alternatives, but $his trust in you has @@.gold;suffered immensely.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<set $activeSlave.trust = random(-90,-75)>>
 	<<set $activeSlave.counter.vaginal += 1>>
 	<<set $vaginalTotal += 1>>
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index 7f4ea68037abdabdb62a988515e1926b43374bf3..363ef0f7e955100722f0c55baaa23aa7b8a01c56 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -316,11 +316,7 @@ $subSlave.slaveName gets inspected more regularly than your other slaves, since
 			while _he2 has _his2 neck twisted back to kiss you.
 		<</if>>
 	<</if>>
-<<<<<<< HEAD
-<<elseif $PC.dick >= 1>>
-=======
 <<elseif $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	extremely eager for a good fuck and there's no better dick than _his2 <<= WrittenMaster($subSlave)>>'s. $subSlave.slaveName has been a good _girl2,
 	<<if ($subSlave.mpreg == 1 && canDoAnal($subSlave) && $subSlave.anus > 0) || ($subSlave.mpreg == 0 && canDoVaginal($subSlave) && $subSlave.vagina > 0)>>
 		<<if $PC.belly >= 5000>>
@@ -960,17 +956,10 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
 		<<= VCheck.Anal()>>
 	<<elseif canDoVaginal($activeSlave)>>
 		<<if $activeSlave.vagina == 0>>
-<<<<<<< HEAD
-			$He hasn't recovered before $he feels the still more urgent pain of <<if $PC.dick >= 1>>your dick brutally @@.lime;stripping $him of $his virginity@@<<else>>an enormous dildo @@.lime;stealing $his virginity@@<</if>>, followed by rough sex,
-			<<set $activeSlave.vagina = 1>>
-		<<else>>
-			$He hasn't recovered before $he feels the still more urgent pain of <<if $PC.dick >= 1>>your dick<<else>>an enormous dildo<</if>> slamming against $his cervix,
-=======
 			$He hasn't recovered before $he feels the still more urgent pain of <<if $PC.dick != 0>>your dick brutally @@.lime;stripping $him of $his virginity@@<<else>>an enormous dildo @@.lime;stealing $his virginity@@<</if>>, followed by rough sex,
 			<<set $activeSlave.vagina = 1>>
 		<<else>>
 			$He hasn't recovered before $he feels the still more urgent pain of <<if $PC.dick != 0>>your dick<<else>>an enormous dildo<</if>> slamming against $his cervix,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<</if>>
 		<<= VCheck.Vaginal()>>
 	<<else>>
@@ -981,11 +970,7 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
 		<<case "ball gag" "bit gag">>
 			you unhook $his gag before
 		<</switch>>
-<<<<<<< HEAD
-		the still more urgent pain of <<if $PC.dick >= 1>>your dick getting shoved as deep down $his throat as you can<<else>>an enormous dildo forcing $his jaw wide and working its way down $his throat<</if>>,
-=======
 		the still more urgent pain of <<if $PC.dick != 0>>your dick getting shoved as deep down $his throat as you can<<else>>an enormous dildo forcing $his jaw wide and working its way down $his throat<</if>>,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.counter.oral++, $oralTotal++>>
 	<</if>>
 	which is then overlaid by rough spanking, nipple pinching, and
@@ -1599,11 +1584,7 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
 		make $him take <<if ($PC.dick == 0)>>a strap-on you've put on<<else>>your dick<</if>>, hard.
 		<<= VCheck.Anal()>>
 	<<else>>
-<<<<<<< HEAD
-		<<if $PC.dick >= 1>>ram your dick down $his throat<<if $PC.vagina >= 1>> and make $him eat you out<</if>><<else>>mash your clit in $his face, making $him eat you out<</if>>.
-=======
 		<<if $PC.dick != 0>>ram your dick down $his throat<<if $PC.vagina != -1>> and make $him eat you out<</if>><<else>>mash your clit in $his face, making $him eat you out<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.counter.oral++, $oralTotal++>>
 	<</if>>
 	You ensure that $he maintains the submissive role throughout. You'll keep an eye on $him, and with this correction @@.hotpink;$he'll become more obedient.@@
@@ -1640,11 +1621,7 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
 		ride <<if ($PC.dick == 0)>>a strap-on you're wearing<<else>>your dick<</if>>.
 		<<= VCheck.Anal()>>
 	<<else>>
-<<<<<<< HEAD
-		<<if $PC.dick >= 1>>suck you off<<if $PC.vagina >= 1>> and eat you out<</if>><<else>>eat you out<</if>> at $his own pace.
-=======
 		<<if $PC.dick != 0>>suck you off<<if $PC.vagina != -1>> and eat you out<</if>><<else>>eat you out<</if>> at $his own pace.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.counter.oral++, $oralTotal++>>
 	<</if>>
 	You ensure that $he maintains the active role throughout. You'll keep an eye on $him, and with this correction @@.hotpink;$he'll become more obedient.@@
@@ -1699,11 +1676,7 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
 	<<if canDoAnal($activeSlave)>>
 		$He squeaks with surprise as you throw $him on the couch, but $his eagerness is obvious. $He does everything right, relaxing as you <<if ($PC.dick == 0)>>push a strap-on into<<else>>enter<</if>> $his ass and enjoying $himself all the way through. $He climaxes hard to <<if ($PC.dick == 0)>>the phallus<<else>>the cock<</if>> in $his asshole. @@.hotpink;$He has become more devoted to you,@@ and @@.lightcoral;$his sexuality now focuses on $his anus.@@
 		<<= VCheck.Anal()>>
-<<<<<<< HEAD
-	<<elseif $PC.dick >= 1>>
-=======
 	<<elseif $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		$He squeaks with surprise as you push $him
 		<<if $activeSlave.belly >= 300000>>
 			onto $his _belly <<if $activeSlave.bellyPreg >= 1500>>pregnancy<<else>>belly<</if>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 6619cf7911ee90dbce46230262d265aac535feab..23968679ca4c92da75bc394db237c8ae14d7f320 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -207,11 +207,7 @@ You check $his records for any potential health issues that could be causing thi
 
 <<case "surprising wakeup">>
 
-<<<<<<< HEAD
-You are awakened from a sound sleep by someone eagerly <<if $PC.dick >= 1>>sucking your dick<<else>>eating you out<</if>>. Your slaves know better than to disturb you, let alone take the initiative, but you are shocked when you pull back the sheets and reveal the smiling <<EventNameLink>>.
-=======
 You are awakened from a sound sleep by someone eagerly <<if $PC.dick != 0>>sucking your dick<<else>>eating you out<</if>>. Your slaves know better than to disturb you, let alone take the initiative, but you are shocked when you pull back the sheets and reveal the smiling <<EventNameLink>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 <<if !canTalk($activeSlave)>>
 	$He promptly stops, flashes you an appreciative smile and goes right back to pleasing you.
 <<else>>
@@ -2436,11 +2432,6 @@ As $his gaze travels down your body towards the floor,
 		average breasts
 	<<elseif $PC.boobs >= 300>>
 		small breasts
-<<<<<<< HEAD
-	<<elseif $PC.boobs >= 1>>
-		generous breasts
-=======
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<</if>>
 	before continuing to track downward. When it reaches your cock, still half-hard from the sex and the warm shower, $he stiffens with discomfort.
 <<else>>
@@ -2459,11 +2450,6 @@ As $his gaze travels down your body towards the floor,
 		average, bare breasts
 	<<elseif $PC.boobs >= 300>>
 		small, bare breasts
-<<<<<<< HEAD
-	<<elseif $PC.boobs >= 1>>
-		generous, bare breasts
-=======
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<</if>>
 	as best $he can, quickly looking farther down. $His gaze lingers for a moment on your cock, still half-hard from the sex and the warm shower, but $he's stiff with discomfort.
 <</if>>
@@ -2926,15 +2912,6 @@ $He's referring to the volume issue with $his unnaturally massive dick. The thin
 With a mind as busy as yours, you sometimes wake up in the middle of the night for no reason that you can remember.<<if $PC.actualAge >= 50>> These incidents have become more common as you age; merely one of time's little mutilations.<</if>> Naturally, waking up in the middle of the night feels much different than it did back before you owned an arcology. Now you have your choice from a virtual buffet of sleeping slaves if you don't feel like going back to sleep right away.
 <br><br>
 The slave on your left is sleeping on _hisU back, and is touching you lightly at the hip and shoulder. The slave on your right, though, is nestled in close, $his shoulder under your arm and $his head resting gently on your
-<<<<<<< HEAD
-<<if $PC.boobsBonus > 2>>
-	enormous <<if $PC.boobsImplant == 1>>firm<<else>>pillowy<</if>> breast.
-<<elseif $PC.boobsBonus == 2>>
-	huge <<if $PC.boobsImplant == 1>>firm<<else>>pillowy<</if>> breast.
-<<elseif $PC.boobsBonus == 1>>
-	big <<if $PC.boobsImplant == 1>>firm<<else>>soft<</if>> breast.
-<<elseif $PC.boobs >= 1>>
-=======
 <<if $PC.boobs >= 1400>>
 	enormous <<if $PC.boobsImplant > 0>>firm<<else>>pillowy<</if>> breast.
 <<elseif $PC.boobs >= 1200>>
@@ -2942,7 +2919,6 @@ The slave on your left is sleeping on _hisU back, and is touching you lightly at
 <<elseif $PC.boobs >= 1000>>
 	big <<if $PC.boobsImplant > 0>>firm<<else>>soft<</if>> breast.
 <<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	bare breast.
 <<elseif $PC.title == 0>>
 	flat chest.
@@ -3234,11 +3210,7 @@ $he <<if canSee($activeSlave)>>looks up to find $himself gazing into your eyes<<
 Opportunities for gallantry didn't used to fall into your lap like this, but with a harem of busy sex slaves living and working in close proximity, they're common. For $his part, $activeSlave.slaveName doesn't seem to mind acting out bad romantic comedy. $He shows no sign of getting back to $his own feet, and nuzzles $his $activeSlave.skin cheek against your
 <<if $PC.belly >= 10000>>
 	taut middle,
-<<<<<<< HEAD
-<<elseif $PC.boobs >= 1>>
-=======
 <<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	boob,
 <<elseif $PC.title == 0>>
 	cute nipple,
@@ -3660,11 +3632,7 @@ $He knows that that's not allowed, and keeps $his hands where they are, though i
 Just as you're about to give <<EventNameLink>> $his weekly inspection, a minor business matter comes up and diverts your attention. So, for about ten minutes, $he has nothing at all to do other than <<if canWalk($activeSlave)>>stand<<elseif hasAnyLegs($activeSlave)>>kneel<<else>>sit<</if>> in front of your desk in your office, <<if canSee($activeSlave)>>watching<<elseif canHear($activeSlave)>>listening to<<else>>feeling the subtle vibrations from<</if>> you,<<if $assistant > 0>> $assistantName's avatar,<</if>> the other slaves who come and go, and the general lewdness of the arcology, much of which is <<if canSee($activeSlave)>>visible<<elseif canHear($activeSlave)>>audible<<else>>apparent<</if>> from right here.
 <<if ($activeSlave.attrXY > 50) && ($PC.boobs < 300)>>
 	$He finds your strong body attractive, and $his gaze rests most frequently <<if canSee($activeSlave)>>on<<else>>towards<</if>> you.
-<<<<<<< HEAD
-<<elseif ($activeSlave.attrXX > 50) && ($PC.boobs >= 1)>>
-=======
 <<elseif ($activeSlave.attrXX > 50) && ($PC.boobs >= 650)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	$He finds your prominent breasts attractive, and $his gaze rests most frequently <<if canSee($activeSlave)>>on<<else>>towards<</if>> them.
 <<elseif $activeSlave.fetish == "pregnancy">>
 	<<if $activeSlave.preg > $activeSlave.pregData.normalBirth/1.33>>
@@ -3856,11 +3824,7 @@ There are sturdy leather seats placed strategically throughout your penthouse. T
 <br><br>
 One of them slows as $he goes by, however. Looking up, you see that it's <<EventNameLink>>. <<if canTalk($activeSlave)>>"Hi <<Master>>," $he <<say>>s flirtatiously<<if $activeSlave.belly >= 1500>> rubbing a hand across $his _belly <<if $activeSlave.bellyPreg > 0>> pregnancy<<else>>belly<</if>><</if>>. "That look<<s>> like a really comfortable <<s>>eat. Can I <<s>>it down and re<<s>>t <<if $activeSlave.belly >= 10000>>my tired leg<<s>> <</if>>for a little while?"<<else>>$He greets you properly, but adds a flirtiness to $his gestures, and asks if $he can sit down and rest <<if $activeSlave.belly >= 10000>> $his <<if $activeSlave.bellyPreg > 0>>gravid<<else>>_belly<</if>> bulk <</if>>on the comfortable seat for a little while.<</if>> $He is not pointing at the soft leather cushion next to you: $he's pointing at your crotch.
 <br><br>
-<<<<<<< HEAD
-You're nude, a consequence of <<if $Concubine != 0 && $Concubine.ID != $activeSlave.ID>>recent activities involving $Concubine.slaveName<<else>>recent unrelated activities<</if>>. <<if $PC.dick >= 1>>Your formidable dick is three quarters hard,<<else>>Nude, that is, all except for the strap-on you were just using and haven't taken off yet,<</if>> and $activeSlave.slaveName is pointing right at it. $He knows exactly what $he's asking for and gives $his <<if $activeSlave.hips > 0>>broad<<elseif $activeSlave.hips > -1>>trim<<else>>narrow<</if>> hips a little wiggle to make it even more abundantly clear.
-=======
 You're nude, a consequence of <<if $Concubine != 0 && $Concubine.ID != $activeSlave.ID>>recent activities involving $Concubine.slaveName<<else>>recent unrelated activities<</if>>. <<if $PC.dick != 0>>Your formidable dick is three quarters hard,<<else>>Nude, that is, all except for the strap-on you were just using and haven't taken off yet,<</if>> and $activeSlave.slaveName is pointing right at it. $He knows exactly what $he's asking for and gives $his <<if $activeSlave.hips > 0>>broad<<elseif $activeSlave.hips > -1>>trim<<else>>narrow<</if>> hips a little wiggle to make it even more abundantly clear.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 <<if ($activeSlave.chastityPenis == 1)>>
 	$His poor dick is visibly straining against the restrictive chastity belt $he's wearing.
 <<elseif canAchieveErection($activeSlave)>>
@@ -4867,13 +4831,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<set $activeSlave.devotion += 5>>
 		<</replace>>
 	<</if>>
-<<<<<<< HEAD
-<</link>><<if ($activeSlave.anus == 0) && ($PC.dick >= 1)>> //This option will take $his anal virginity//<</if>>
-<<if $PC.vagina >= 1>>
-=======
 <</link>><<if ($activeSlave.anus == 0) && ($PC.dick != 0)>> //This option will take $his anal virginity//<</if>>
 <<if $PC.vagina > 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<br><<link "Let me teach you how to use it">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
@@ -4907,11 +4866,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<else>>
 				hypertrophied dick
 			<</if>>
-<<<<<<< HEAD
-			You push $him back down as you straddle $his cock, lining it up before lowering <<if $PC.belly >= 1500>>your pregnant body until $he delightfully penetrates you<<else>>yourself onto $his needy prick<</if>>. You slowly ride $his dick, instructing $him the proper way to thrust into you and how to adequately support your weight. Once $he gets the hand of things, you dismount and lie down on the couch, legs spread, beckoning $him into you. $He gingerly inserts $his cock<<if $activeSlave.belly >= 100000>> while you do your best to manage $his _belly stomach<</if>> and begins thrusting, slowly at first, before getting the hang of things and speeding up<<if $PC.dick >= 1>>, your own neglected dick bobbing along to $his thrusts<</if>>. As soon as you feel $his beginning to tense you <<if $PC.pregKnown == 1>>tell $him it's safe to cum in you, you're already pregnant<<else>>order $him to pull out<</if>>. The poor $girl is so caught up in $his lust, $he can't stop thrusting. Before you can rectify this, $he pushes you over the edge and gushes deep into you as you climax<<if $PC.dick >= 1>> and spray your own cum <<if $PC.belly >= 5000 && $activeSlave.belly >= 5000>>into the cramped space between your swollen bodies<<elseif $activeSlave.belly >= 100000>>across your belly and the underside of $hers<<else>>across $his chest<</if>><</if>>. $He gingerly pulls $himself from you, apologizes @@.hotpink;meekly@@ for losing control, and snuggles up next to you. Cumming in $his <<= WrittenMaster()>>'s pussy as $his first time builds @@.mediumaquamarine;a special bond@@ with you.
-=======
 			You push $him back down as you straddle $his cock, lining it up before lowering <<if $PC.belly >= 1500>>your pregnant body until $he delightfully penetrates you<<else>>yourself onto $his needy prick<</if>>. You slowly ride $his dick, instructing $him the proper way to thrust into you and how to adequately support your weight. Once $he gets the hand of things, you dismount and lie down on the couch, legs spread, beckoning $him into you. $He gingerly inserts $his cock<<if $activeSlave.belly >= 100000>> while you do your best to manage $his _belly stomach<</if>> and begins thrusting, slowly at first, before getting the hang of things and speeding up<<if $PC.dick != 0>>, your own neglected dick bobbing along to $his thrusts<</if>>. As soon as you feel $his beginning to tense you <<if $PC.pregKnown == 1>>tell $him it's safe to cum in you, you're already pregnant<<else>>order $him to pull out<</if>>. The poor $girl is so caught up in $his lust, $he can't stop thrusting. Before you can rectify this, $he pushes you over the edge and gushes deep into you as you climax<<if $PC.dick != 0>> and spray your own cum <<if $PC.belly >= 5000 && $activeSlave.belly >= 5000>>into the cramped space between your swollen bodies<<elseif $activeSlave.belly >= 100000>>across your belly and the underside of $hers<<else>>across $his chest<</if>><</if>>. $He gingerly pulls $himself from you, apologizes @@.hotpink;meekly@@ for losing control, and snuggles up next to you. Cumming in $his <<= WrittenMaster()>>'s pussy as $his first time builds @@.mediumaquamarine;a special bond@@ with you.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if $PC.preg == 0 && $PC.pregWeek == 0>>
 				You aren't on contraceptives right now; $his first time may be more fruitful than $he realizes.
 			<</if>>
@@ -4957,11 +4912,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <<link "Permit $him to continue">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-		You can't complain, it feels really good. You don't know where this skill was lurking in $his broken mind, but you're glad to see it put to good use. <<if $PC.dick >= 1>>Just as you are about to cum, $he takes the full length of your dick down $his throat, diligently taking in every drop of cum<<else>>Even as you buck with pleasure, $he diligently keeps $his tongue to your clit and pussy, making sure you don't go a moment without pleasure<</if>>. You don't have an orgasm like that every day, and as $he looks at you lovingly, you prod $him with your still hard <<if $PC.dick >= 1>>cock<<else>>clit<</if>> for round two.
-=======
 		You can't complain, it feels really good. You don't know where this skill was lurking in $his broken mind, but you're glad to see it put to good use. <<if $PC.dick != 0>>Just as you are about to cum, $he takes the full length of your dick down $his throat, diligently taking in every drop of cum<<else>>Even as you buck with pleasure, $he diligently keeps $his tongue to your clit and pussy, making sure you don't go a moment without pleasure<</if>>. You don't have an orgasm like that every day, and as $he looks at you lovingly, you prod $him with your still hard <<if $PC.dick != 0>>cock<<else>>clit<</if>> for round two.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		$He is @@.green;no longer mindbroken@@ and for whatever twisted reasons deeply and sincerely @@.hotpink;loves@@ and @@.mediumaquamarine;trusts@@ you.
 		<<set $activeSlave.devotion = 90, $activeSlave.oldDevotion = 90, $activeSlave.trust = 90, $activeSlave.oldTrust = 90, $activeSlave.sexualQuirk = "caring", $activeSlave.fetish = "none", $activeSlave.fetishKnown = 1>>
 		<<set _ress = $genePool.findIndex(function(s) { return s.ID == $activeSlave.ID; })>>
@@ -4997,11 +4948,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		Getting head isn't going to cut it. You easily overpower the startled $desc and
 		<<if canDoVaginal($activeSlave)>>
 			flip $him onto $his back.
-<<<<<<< HEAD
-			<<if $PC.dick >= 1>>
-=======
 			<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				You viciously rape $him, forcing yourself deep into $him before painting $his insides with your seed. You leave the quivering $girl to leak fluids while you get comfortable again.
 				<<if $activeSlave.vagina == 0>>$His once virgin pussy now @@.lime;gapes slightly@@ after your enjoyment of it.<<set $activeSlave.vagina++>><</if>>
 			<<else>>
@@ -5016,11 +4963,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<</if>>
 		<<elseif canDoAnal($activeSlave)>>
 			force $his ass into the air.
-<<<<<<< HEAD
-			<<if $PC.dick >= 1>>
-=======
 			<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				You viciously assrape $him, cumming strongly into $his spasming anus while making sure to save one last spurt to paint $his back with.
 				<<if $activeSlave.anus == 0>>$His once virgin hole now @@.lime;gapes slightly@@ after your enjoyment of it.<<set $activeSlave.anus++>><</if>>
 			<<else>>
@@ -5035,11 +4978,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<set $analTotal++>>
 		<<else>>
 			slam $his head into your crotch.
-<<<<<<< HEAD
-			<<if $PC.dick >= 1>>
-=======
 			<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				You viciously facefuck $him, cumming strongly down $his gagging throat while making sure to save one last spurt to paint $his face with.
 			<<else>>
 				As $he recoils, you grab a strap-on and force it into $his mouth before fastening it to yourself. Once you are situated, you viciously facefuck $him until you are satisfied. As $he struggles to catch $his breath, you toggle the release and reveal that it is a squirt dildo, painting $his face with fake semen.
@@ -5217,11 +5156,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					<<if $activeSlave.vagina == -2>>
 						<br><<link "Surgically alter $his gender">>
 							<<replace "#result2">>
-<<<<<<< HEAD
-								You ask $him if $he enjoyed the last time $he used $his dick and if it was worth crossing you, because it will not happen again. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a shemale@@ $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>> into $his virgin pussy. You use $him until you are satisfied and toss $him to the floor to think about $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
-=======
 								You ask $him if $he enjoyed the last time $he used $his dick and if it was worth crossing you, because it will not happen again. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a shemale@@ $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> into $his virgin pussy. You use $him until you are satisfied and toss $him to the floor to think about $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 								<<set $activeSlave.trust -= 30, $activeSlave.devotion -= 25, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.balls = 0, $activeSlave.scrotum = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.vagina = 1, $activeSlave.chastityPenis = 0>>
 								<<= VCheck.Vaginal()>>
 								<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>>
@@ -5240,11 +5175,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					<</if>>
 					<br><<link "Deny $him from ever having satisfying sex again">>
 						<<replace "#result2">>
-<<<<<<< HEAD
-							You ask $him if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>> into $his anus. As $his arousal grows, $he realizes you not only took $his dick, but $his prostate as well. $He quickly finds $himself desperate for release but lacking any way to do so. You watch $him squirm in sexual frustration. This will be $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
-=======
 							You ask $him if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> into $his anus. As $his arousal grows, $he realizes you not only took $his dick, but $his prostate as well. $He quickly finds $himself desperate for release but lacking any way to do so. You watch $him squirm in sexual frustration. This will be $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 							<<set $activeSlave.trust -= 50, $activeSlave.devotion -= 30, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.chastityPenis = 0, $activeSlave.vagina = 0, $activeSlave.ovaries = 0, $activeSlave.clit = 0, $activeSlave.labia = 0, $activeSlave.vaginalAccessory = "none", $activeSlave.vaginalAttachment = "none", $activeSlave.chastityVagina = 0>>
 							<<= VCheck.Anal()>>
 							<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>>
@@ -5421,11 +5352,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					<<if $activeSlave.vagina == -2>>
 						<br><<link "Surgically alter $his gender">>
 							<<replace "#result2">>
-<<<<<<< HEAD
-								You ask $him if $he enjoyed the last time $he used $his dick and if it was worth crossing you, because it will not happen again. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a shemale@@ and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>> into $his virgin pussy. You use $him until you are satisfied and toss $him to the floor to think about $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
-=======
 								You ask $him if $he enjoyed the last time $he used $his dick and if it was worth crossing you, because it will not happen again. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a shemale@@ and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> into $his virgin pussy. You use $him until you are satisfied and toss $him to the floor to think about $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 								<<set $activeSlave.trust -= 30, $activeSlave.devotion -= 25, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.balls = 0, $activeSlave.scrotum = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.vagina = 1, $activeSlave.chastityPenis = 0>>
 								<<= VCheck.Vaginal()>>
 								<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>>
@@ -5444,11 +5371,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					<</if>>
 					<br><<link "Deny $him from ever having satisfying sex again">>
 						<<replace "#result2">>
-<<<<<<< HEAD
-							You ask $him if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>> into $his anus. As $his arousal grows, $he realizes you not only took $his dick, but $his prostate as well. $He quickly finds $himself desperate for release but lacking any way to do so. You watch $him squirm in sexual frustration. This will be $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
-=======
 							You ask $him if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> into $his anus. As $his arousal grows, $he realizes you not only took $his dick, but $his prostate as well. $He quickly finds $himself desperate for release but lacking any way to do so. You watch $him squirm in sexual frustration. This will be $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 							<<set $activeSlave.trust -= 50, $activeSlave.devotion -= 30, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.chastityPenis = 0, $activeSlave.vagina = 0, $activeSlave.ovaries = 0, $activeSlave.clit = 0, $activeSlave.labia = 0, $activeSlave.vaginalAccessory = "none", $activeSlave.vaginalAttachment = "none", $activeSlave.chastityVagina = 0>>
 							<<= VCheck.Anal()>>
 							<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>>
@@ -5499,11 +5422,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<if $activeSlave.vagina == -2>>
 				<br><<link "Surgically alter $his gender">>
 					<<replace "#result2">>
-<<<<<<< HEAD
-						You ask $him if $he enjoyed the last time $he used $his dick and if it was worth crossing you, because it will not happen again. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a shemale@@ and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>> into $his virgin pussy. You use $him until you are satisfied and toss $him to the floor to think about $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
-=======
 						You ask $him if $he enjoyed the last time $he used $his dick and if it was worth crossing you, because it will not happen again. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a shemale@@ and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> into $his virgin pussy. You use $him until you are satisfied and toss $him to the floor to think about $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 						<<set $activeSlave.trust -= 30, $activeSlave.devotion -= 25, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.balls = 0, $activeSlave.scrotum = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.vagina = 1, $activeSlave.chastityPenis = 0>>
 						<<= VCheck.Vaginal()>>
 						<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>>
@@ -5522,11 +5441,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<</if>>
 			<br><<link "Deny $him from ever having satisfying sex again">>
 				<<replace "#result2">>
-<<<<<<< HEAD
-					You ask $him if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>> into $his anus. As $his arousal grows, $he realizes you not only took $his dick, but $his prostate as well. $He quickly finds $himself desperate for release but lacking any way to do so. You watch $him squirm in sexual frustration. This will be $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
-=======
 					You ask $him if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> into $his anus. As $his arousal grows, $he realizes you not only took $his dick, but $his prostate as well. $He quickly finds $himself desperate for release but lacking any way to do so. You watch $him squirm in sexual frustration. This will be $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					<<set $activeSlave.trust -= 50, $activeSlave.devotion -= 30, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.chastityPenis = 0, $activeSlave.vagina = 0, $activeSlave.ovaries = 0, $activeSlave.clit = 0, $activeSlave.labia = 0, $activeSlave.vaginalAccessory = "none", $activeSlave.vaginalAttachment = "none", $activeSlave.chastityVagina = 0>>
 					<<= VCheck.Anal()>>
 					<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>>
@@ -5921,11 +5836,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <<link "Apply lotion liberally">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-		You reach down to take $his hands, and pull $him up to stand in front of you before crushing $him in a frankly sexual embrace. Taking charge of the lotion, you apply it to your hands and start with $his face. $He submits to your close attention, even closing $his eyes so you can get $his eyelids, only a slight quickening of breath betraying $his intensity of feeling at having you do this. You take your time, which turns into exquisite sexual torture when you finally reach $his <<if $activeSlave.boobs > 2000>>incredible breasts, which stand out so far in front of $him that you have to reach around their mass rather inelegantly<<elseif $activeSlave.boobs > 800>>heavy breasts<<else>>lovely chest<</if>>. When your warm, moist hands <<if $activeSlave.nipples != "fuckable">>rub<<else>>slip into<</if>> $his<<if $activeSlave.lactation > 0>> milky<</if>> nipples, $he cannot suppress a moan. You take pity, take $his hands, guide them to the lotion bottle, and coat them generously. Then, you place $his hands in yours and move them to between $his legs, manipulating them like a music teacher guiding a pupil's hands on an instrument, guiding $him in gentle masturbation. You go back to applying lotion to the rest of $his body, enjoying the slave's intense pleasure. When you've covered every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of $him, you hug $him close, returning your hands to $his nipples <<if $PC.dick >= 1>>and pushing your rock-hard prick in between $his well-lubricated thighs<<if $PC.vagina >= 1>>, <</if>><</if>><<if $PC.vagina >= 1>>after guiding one of $hers around behind $him to see to your pussy<</if>>. $He quickens $his pace<<if canSee($activeSlave)>> and raises $his gaze to the mirror, seeing $his magnificently nude, $activeSlave.skin skin flushed with arousal<<else>>, feeling $his magnificently nude, $activeSlave.skin skin flush with arousal<</if>> as $his
-=======
 		You reach down to take $his hands, and pull $him up to stand in front of you before crushing $him in a frankly sexual embrace. Taking charge of the lotion, you apply it to your hands and start with $his face. $He submits to your close attention, even closing $his eyes so you can get $his eyelids, only a slight quickening of breath betraying $his intensity of feeling at having you do this. You take your time, which turns into exquisite sexual torture when you finally reach $his <<if $activeSlave.boobs > 2000>>incredible breasts, which stand out so far in front of $him that you have to reach around their mass rather inelegantly<<elseif $activeSlave.boobs > 800>>heavy breasts<<else>>lovely chest<</if>>. When your warm, moist hands <<if $activeSlave.nipples != "fuckable">>rub<<else>>slip into<</if>> $his<<if $activeSlave.lactation > 0>> milky<</if>> nipples, $he cannot suppress a moan. You take pity, take $his hands, guide them to the lotion bottle, and coat them generously. Then, you place $his hands in yours and move them to between $his legs, manipulating them like a music teacher guiding a pupil's hands on an instrument, guiding $him in gentle masturbation. You go back to applying lotion to the rest of $his body, enjoying the slave's intense pleasure. When you've covered every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of $him, you hug $him close, returning your hands to $his nipples <<if $PC.dick != 0>>and pushing your rock-hard prick in between $his well-lubricated thighs<<if $PC.vagina != -1>>, <</if>><</if>><<if $PC.vagina != -1>>after guiding one of $hers around behind $him to see to your pussy<</if>>. $He quickens $his pace<<if canSee($activeSlave)>> and raises $his gaze to the mirror, seeing $his magnificently nude, $activeSlave.skin skin flushed with arousal<<else>>, feeling $his magnificently nude, $activeSlave.skin skin flush with arousal<</if>> as $his
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<if ($activeSlave.chastityPenis == 1)>>
 			<<if canDoAnal($activeSlave)>>
 				eager fingering of $his anus turn frantic.
@@ -5973,11 +5884,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<<else>>
 					rub $his taint.
 				<</if>>
-<<<<<<< HEAD
-				$He manages to climax promptly, $his overstimulated sphincter helping, no doubt. $He slumps to the ground when you withdraw your hand, gasping, but you haul $him around so $he can <<if $PC.dick >= 1>>suck you off<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eat you out<</if>>. $He complies @@.hotpink;submissively,@@ drooling and groaning, all pretense of feminine grace gone. It doesn't take long, since that was quite a lot of fun, but by the time you finish $he's already masturbating again.
-=======
 				$He manages to climax promptly, $his overstimulated sphincter helping, no doubt. $He slumps to the ground when you withdraw your hand, gasping, but you haul $him around so $he can <<if $PC.dick != 0>>suck you off<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>>. $He complies @@.hotpink;submissively,@@ drooling and groaning, all pretense of feminine grace gone. It doesn't take long, since that was quite a lot of fun, but by the time you finish $he's already masturbating again.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<elseif $activeSlave.anus == 2>>
 				$He grunts when you add a third, and begins to beg when you insert a fourth. When $he feels you form your hand into a point, thumb included, $he understands what's coming and does $his best to relax. The wide part of your hand, at the knuckles, squeezes into $him after some effort on your part and squealing on $his part. When you withdraw it and press it back in, slowly starting to fist fuck $his ass, though, $he collapses to $his knees,
 				<<if ($activeSlave.fetish == "buttslut")>>
@@ -6001,11 +5908,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<<else>>
 					rub $his taint.
 				<</if>>
-<<<<<<< HEAD
-				$He manages to climax eventually. $He slumps to the ground when you withdraw your hand, gasping, but you haul $his around so $he can <<if $PC.dick >= 1>>suck you off<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eat you out<</if>>. $He complies @@.hotpink;submissively,@@ drooling and weeping, all pretense of feminine grace gone. It doesn't take long, since that was quite a lot of fun, but by the time you finish $he's tentatively masturbating again.
-=======
 				$He manages to climax eventually. $He slumps to the ground when you withdraw your hand, gasping, but you haul $his around so $he can <<if $PC.dick != 0>>suck you off<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>>. $He complies @@.hotpink;submissively,@@ drooling and weeping, all pretense of feminine grace gone. It doesn't take long, since that was quite a lot of fun, but by the time you finish $he's tentatively masturbating again.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<else>>
 				$He squeals when you add a third, and begins to shamelessly beg for mercy when you insert a fourth. When $he feels you form your hand into a point, thumb included, $he understands what's coming and collapses to $his knees,
 				<<if ($activeSlave.fetish == "buttslut")>>
@@ -6029,11 +5932,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<<else>>
 					rub $his taint.
 				<</if>>
-<<<<<<< HEAD
-				As $he works $his sphincter relaxes bit by bit, and you advance your fist up $his butt. $He screams in surprise and relief when your knuckles finally make it in, and achieves a crying orgasm shortly thereafter. $He slumps to the ground when you withdraw your hand, moaning incoherently, but you haul $him around so $he can <<if $PC.dick >= 1>>suck you off<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eat you out<</if>>. $He complies @@.hotpink;submissively,@@ crying quietly in confusion and disarray, all pretense of feminine grace gone. It doesn't take long, since that was quite a lot of fun, and by the time you finish $he hasn't yet worked up the courage to touch $his @@.lime;newly widened backdoor.@@
-=======
 				As $he works $his sphincter relaxes bit by bit, and you advance your fist up $his butt. $He screams in surprise and relief when your knuckles finally make it in, and achieves a crying orgasm shortly thereafter. $He slumps to the ground when you withdraw your hand, moaning incoherently, but you haul $him around so $he can <<if $PC.dick != 0>>suck you off<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>>. $He complies @@.hotpink;submissively,@@ crying quietly in confusion and disarray, all pretense of feminine grace gone. It doesn't take long, since that was quite a lot of fun, and by the time you finish $he hasn't yet worked up the courage to touch $his @@.lime;newly widened backdoor.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<set $activeSlave.anus += 1>>
 			<</if>>
 			<<set $activeSlave.devotion += 5>>
@@ -6044,11 +5943,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<br><<link "Fist $his pussy">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
-<<<<<<< HEAD
-			You slide up behind $him and run a possessive hand down<<if $activeSlave.belly >= 1500>> $his swollen midriff down<</if>> to finger $his pussylips. $He compliantly cocks $his hips backward for you, and is surprised to find a couple of warm, lubricated fingers rather than <<if $PC.dick >= 1>>your cock<<else>>a strap-on<</if>> sliding into $his ready cunt.
-=======
 			You slide up behind $him and run a possessive hand down<<if $activeSlave.belly >= 1500>> $his swollen midriff down<</if>> to finger $his pussylips. $He compliantly cocks $his hips backward for you, and is surprised to find a couple of warm, lubricated fingers rather than <<if $PC.dick != 0>>your cock<<else>>a strap-on<</if>> sliding into $his ready cunt.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if $activeSlave.vagina > 2>>
 				$He moans when you add a third, and grunts when you insert a fourth. When $he feels you form your hand into a point, thumb included, $he understands what's coming and relaxes completely. The wide part of your hand, at the knuckles, squeezes into $him without much trouble, and $he lets out a huge sigh. When you start to fuck $his huge cunt with your hand, though, $he collapses <<if $activeSlave.belly >= 300000>>onto $his _belly belly<<else>>to $his knees<</if>>, whining and begging nonverbally. You kick the lotion towards $his hand; $he gets the message and starts to frantically
 				<<if ($activeSlave.chastityPenis == 1)>>
@@ -6062,11 +5957,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<<else>>
 					rub $his taint.
 				<</if>>
-<<<<<<< HEAD
-				$He manages to climax promptly, $his big vagina squeezing your hand strongly. $He slumps to the ground when you withdraw your hand, gasping, the collapse giving you a good view into $his open, pink-walled channel. You haul $his around so $he can <<if $PC.dick >= 1>>suck you off<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eat you out<</if>>. $He complies @@.hotpink;submissively,@@ drooling and groaning, all pretense of feminine grace gone. It doesn't take long, since that was quite a lot of fun, but by the time you finish $he's replaced your hand with $his own.
-=======
 				$He manages to climax promptly, $his big vagina squeezing your hand strongly. $He slumps to the ground when you withdraw your hand, gasping, the collapse giving you a good view into $his open, pink-walled channel. You haul $his around so $he can <<if $PC.dick != 0>>suck you off<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>>. $He complies @@.hotpink;submissively,@@ drooling and groaning, all pretense of feminine grace gone. It doesn't take long, since that was quite a lot of fun, but by the time you finish $he's replaced your hand with $his own.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<set $activeSlave.devotion += 5>>
 			<<elseif $activeSlave.vagina == 2>>
 				$He grunts when you add a third, and begins to beg when you insert a fourth. When $he feels you form your hand into a point, thumb included, $he understands what's coming and hurriedly gets down <<if $activeSlave.belly >= 300000>>onto $his _belly belly<<else>>on $his knees<</if>> to present a more comfortable angle. The wide part of your hand, at the knuckles, squeezes into $him after some effort on your part and squealing on $his part. You kick the lotion towards $his hand; $he gets the message and starts to frantically
@@ -6081,11 +5972,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<<else>>
 					rub $his taint
 				<</if>>
-<<<<<<< HEAD
-				as you slowly fist fuck $him. $He manages to climax eventually. $He slumps to the ground when you withdraw your hand, gasping, the collapse giving you a good view into $his now-gaping, pink-walled channel. You haul $him around so $he can <<if $PC.dick >= 1>>suck you off<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eat you out<</if>>. $He complies @@.hotpink;submissively,@@ drooling and gasping, all pretense of feminine grace gone. It doesn't take long, since that was quite a lot of fun, but by the time you finish $he's masturbating again.
-=======
 				as you slowly fist fuck $him. $He manages to climax eventually. $He slumps to the ground when you withdraw your hand, gasping, the collapse giving you a good view into $his now-gaping, pink-walled channel. You haul $him around so $he can <<if $PC.dick != 0>>suck you off<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>>. $He complies @@.hotpink;submissively,@@ drooling and gasping, all pretense of feminine grace gone. It doesn't take long, since that was quite a lot of fun, but by the time you finish $he's masturbating again.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<set $activeSlave.devotion += 5>>
 			<<else>>
 				$He squeals when you add a third, and begins to shamelessly beg for mercy when you insert a fourth. When $he feels you form your hand into a point, thumb included, $he understands what's coming and collapses <<if $activeSlave.belly >= 300000>>onto $his _belly belly<<else>>to $his knees<</if>>, begging you to be gentle. You kick the lotion towards $his hand; $he gets the message and starts to frantically
@@ -6100,11 +5987,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<<else>>
 					rub $his taint,
 				<</if>>
-<<<<<<< HEAD
-				hoping to relax a little. As $he works $his pussy relaxes bit by bit, and you advance your fist into $his womanhood. $He screams in surprise and relief when your knuckles finally make it in, and achieves a crying orgasm shortly thereafter. $He slumps to the ground when you withdraw your hand, moaning incoherently, the collapse giving you a good view into $his now-gaping, pink-walled channel. You haul $his around so $he can <<if $PC.dick >= 1>>suck you off<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eat you out<</if>>. $He complies @@.hotpink;submissively,@@ crying quietly with overstimulation, all pretense of feminine grace gone. It doesn't take long, since that was quite a lot of fun, but by the time you finish $he's gingerly massaging $his @@.lime;newly loosened cunt.@@
-=======
 				hoping to relax a little. As $he works $his pussy relaxes bit by bit, and you advance your fist into $his womanhood. $He screams in surprise and relief when your knuckles finally make it in, and achieves a crying orgasm shortly thereafter. $He slumps to the ground when you withdraw your hand, moaning incoherently, the collapse giving you a good view into $his now-gaping, pink-walled channel. You haul $his around so $he can <<if $PC.dick != 0>>suck you off<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>>. $He complies @@.hotpink;submissively,@@ crying quietly with overstimulation, all pretense of feminine grace gone. It doesn't take long, since that was quite a lot of fun, but by the time you finish $he's gingerly massaging $his @@.lime;newly loosened cunt.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<set $activeSlave.devotion += 5, $activeSlave.vagina += 1>>
 			<</if>>
 		<</replace>>
@@ -6222,11 +6105,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<elseif _meetingBonus < 1000>>
 			<<set _meetingBonus = 1000>>
 		<</if>>
-<<<<<<< HEAD
-		You finish the motion and get on with your day. $He burrows into the warm place on the bed where your body lay, which is actually an excellent sign of $his mental state. It suggests that $his dreaming mind is quite comfortable with your presence<<if canSmell($activeSlave)>> and even smell<</if>>. You make the meeting, consoling yourself with the thought that you're hardly lacking for opportunities to <<if $PC.dick >= 1>>stick your dick in<<else>>have sex with<</if>> $activeSlave.slaveName. The business opportunity turns out to be @@.yellowgreen;quite profitable;@@ you're glad you didn't pass it up.
-=======
 		You finish the motion and get on with your day. $He burrows into the warm place on the bed where your body lay, which is actually an excellent sign of $his mental state. It suggests that $his dreaming mind is quite comfortable with your presence<<if canSmell($activeSlave)>> and even smell<</if>>. You make the meeting, consoling yourself with the thought that you're hardly lacking for opportunities to <<if $PC.dick != 0>>stick your dick in<<else>>have sex with<</if>> $activeSlave.slaveName. The business opportunity turns out to be @@.yellowgreen;quite profitable;@@ you're glad you didn't pass it up.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<run cashX(_meetingBonus, "event", $activeSlave)>>
 	<</replace>>
 <</link>>
@@ -6249,11 +6128,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<else>>
 			kid
 		<</if>>
-<<<<<<< HEAD
-		draped across you. The meeting is long enough that your interlocutors eventually realize that something unusual is going on, especially once $he wakes up and starts sleepily <<if $PC.dick >= 1>>sucking your dick<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eating you out<</if>>, out of frame. They're @@.red;slightly annoyed,@@ since having sex during meetings is still considered a minor faux pas, but you @@.yellowgreen;close the deal,@@ and $activeSlave.slaveName is @@.hotpink;very pleased@@ that you would rearrange your affairs to make time for <<if $PC.dick >= 1>>one of $his blowjobs<<else>>oral sex with $him<</if>>.
-=======
 		draped across you. The meeting is long enough that your interlocutors eventually realize that something unusual is going on, especially once $he wakes up and starts sleepily <<if $PC.dick != 0>>sucking your dick<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eating you out<</if>>, out of frame. They're @@.red;slightly annoyed,@@ since having sex during meetings is still considered a minor faux pas, but you @@.yellowgreen;close the deal,@@ and $activeSlave.slaveName is @@.hotpink;very pleased@@ that you would rearrange your affairs to make time for <<if $PC.dick != 0>>one of $his blowjobs<<else>>oral sex with $him<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.counter.oral++, $oralTotal++>>
 		<<run cashX(_meetingBonus, "event", $activeSlave)>>
 		<<run repX(forceNeg(50), "event", $activeSlave)>>
@@ -6389,27 +6264,16 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<</if>>
 			<<set $activeSlave.counter.mammary++, $mammaryTotal++>>
 		<<elseif $activeSlave.trust >= 80 && $activeSlave.toyHole == "dick" && canPenetrate($activeSlave)>>
-<<<<<<< HEAD
-			"my cock i<<s>> getting <<s>>unburnt! Plea<<s>>e, <<Master>>, help me find <<s>>omepla<<c>>e to hide it!" $He wiggles $his pelvis around to make $himself bounce enticingly, and then giggles happily as you get on top of $him and slip $his sun-warmed dick deep into your <<if $PC.vagina >= 1>>pussy<<else>>asshole<</if>><<if $PC.dick >= 1>>, shuddering with delight at the warmth tickling your prostate<</if>>.
-=======
 			"my cock i<<s>> getting <<s>>unburnt! Plea<<s>>e, <<Master>>, help me find <<s>>omepla<<c>>e to hide it!" $He wiggles $his pelvis around to make $himself bounce enticingly, and then giggles happily as you get on top of $him and slip $his sun-warmed dick deep into your <<if $PC.vagina != -1>>pussy<<else>>asshole<</if>><<if $PC.dick != 0>>, shuddering with delight at the warmth tickling your prostate<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<set $activeSlave.counter.penetrative++, $penetrativeTotal++>>
 			<<if canImpreg($PC, $activeSlave)>>
 				<<= knockMeUp($PC, 20, 0, $activeSlave.ID)>>
 			<</if>>
 		<<elseif ($activeSlave.vagina <= 0)>>
-<<<<<<< HEAD
-			"my butt i<<s>> getting <<s>>unburnt! Plea<<s>>e, <<Master>>, help me!" $He rolls over and spreads $his buttocks, begging you to cover $him up. $He moans as $he feels <<if $PC.dick >= 1>>your cockhead<<else>>a strap-on<</if>> penetrate $his asshole, $his sun-warmed buttocks clenching wonderfully against your crotch.
-			<<set _didAnal = 1>>
-		<<else>>
-			"my pu<<ss>>y i<<s>> getting <<s>>unburnt! Plea<<s>>e, <<Master>>, help me!" $He spreads $his legs invitingly, running a hand across $his clit and down to spread $his pussylips to the sunshine. $He moans as $he feels <<if $PC.dick >= 1>>your cockhead<<else>>a strap-on<</if>> penetrate $him, $his sun-warmed chest warm against yours.
-=======
 			"my butt i<<s>> getting <<s>>unburnt! Plea<<s>>e, <<Master>>, help me!" $He rolls over and spreads $his buttocks, begging you to cover $him up. $He moans as $he feels <<if $PC.dick != 0>>your cockhead<<else>>a strap-on<</if>> penetrate $his asshole, $his sun-warmed buttocks clenching wonderfully against your crotch.
 			<<set _didAnal = 1>>
 		<<else>>
 			"my pu<<ss>>y i<<s>> getting <<s>>unburnt! Plea<<s>>e, <<Master>>, help me!" $He spreads $his legs invitingly, running a hand across $his clit and down to spread $his pussylips to the sunshine. $He moans as $he feels <<if $PC.dick != 0>>your cockhead<<else>>a strap-on<</if>> penetrate $him, $his sun-warmed chest warm against yours.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<set _didVaginal = 1>>
 		<</if>>
 		$He @@.mediumaquamarine;trusts you more@@ for being witty with $him, for allowing $him the simple pleasure of a little sunbathing — and for sharing fun sex with $him, of course.
@@ -6506,13 +6370,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		$He shivers a little when $he <<if canSee($activeSlave)>>sees<<elseif canHear($activeSlave)>>hears<<else>>senses<</if>> you slide out from behind your desk and approach $him. $His overcharged sex drive allows $him no refractory period at all, and the hunger <<if !canSee($activeSlave)>>on $his face<<else>>in $his eyes<</if>> is undiminished. You pause to consider $him and $his face falls a little as $he wonders what you're planning. $He's wrong to doubt you;
 		<<if ($activeSlave.fetish == "submissive") && ($activeSlave.fetishKnown == 1)>>
 			you pull $him in and embrace $him strongly, causing the submissive slut to melt into your
-<<<<<<< HEAD
-			<<if $PC.boobs >= 1>>
-				<<if $PC.boobsImplant == 1>>
-=======
 			<<if $PC.boobs >= 300>>
 				<<if $PC.boobsImplant != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					firm chest.
 				<<else>>
 					soft chest.
@@ -6539,19 +6398,11 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<<set _didAnal = 1>>
 			<</if>>
 		<<elseif ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>
-<<<<<<< HEAD
-			you <<if canSee($activeSlave)>>point at the couch<<else>>state "couch"<</if>> and $he hurries over to kneel and offer you $his asshole. Since the butthole slut clearly doesn't need any foreplay today, the first contact between you is <<if $PC.dick >= 1>>the tip of your cock<<else>>the head of your strap-on<</if>> pressing forcefully against $his anus. $He gives a huge shuddering gasp of satisfaction as $his sphincter stretches around the invading phallus.
-			<<set _didAnal = 1>>
-		<<elseif ($activeSlave.fetish == "boobs") && ($activeSlave.fetishKnown == 1)>>
-			you play with $his nipples until they<<if $activeSlave.nipples != "fuckable">>'re good and hard<<else>> swallow your fingers<</if>>, while $he stands there shamelessly presenting $his breasts for your play. Once you're satisfied they can't get any harder, you
-			<<if $PC.dick >= 1>>
-=======
 			you <<if canSee($activeSlave)>>point at the couch<<else>>state "couch"<</if>> and $he hurries over to kneel and offer you $his asshole. Since the butthole slut clearly doesn't need any foreplay today, the first contact between you is <<if $PC.dick != 0>>the tip of your cock<<else>>the head of your strap-on<</if>> pressing forcefully against $his anus. $He gives a huge shuddering gasp of satisfaction as $his sphincter stretches around the invading phallus.
 			<<set _didAnal = 1>>
 		<<elseif ($activeSlave.fetish == "boobs") && ($activeSlave.fetishKnown == 1)>>
 			you play with $his nipples until they<<if $activeSlave.nipples != "fuckable">>'re good and hard<<else>> swallow your fingers<</if>>, while $he stands there shamelessly presenting $his breasts for your play. Once you're satisfied they can't get any harder, you
 			<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				push $him to $his knees<<if $activeSlave.nipples != "fuckable">>, tell $him to take over the nipple stimulation,<</if>> and fuck $his boobs.
 			<<else>>
 				throw $him down on the couch, straddle $his boobs, and <<if $activeSlave.nipples != "fuckable">>ride each of $his erect<<else>>trib $his<</if>> nipples in turn.
@@ -6581,11 +6432,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<<set _didAnal = 1>>
 			<</if>>
 		<<elseif ($activeSlave.fetish == "sadist") && ($activeSlave.fetishKnown == 1)>>
-<<<<<<< HEAD
-			you call in a less favored slave and let $activeSlave.slaveName spank $him until $he's fully aroused again. That done, you and $activeSlave.slaveName spitroast the poor girl, with $activeSlave.slaveName taking the rear end. Judging by how the victim screams into your <<if $PC.dick >= 1>>cock<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>cunt<</if>>, $activeSlave.slaveName is not being very nice to $him at all.
-=======
 			you call in a less favored slave and let $activeSlave.slaveName spank $him until $he's fully aroused again. That done, you and $activeSlave.slaveName spitroast the poor girl, with $activeSlave.slaveName taking the rear end. Judging by how the victim screams into your <<if $PC.dick != 0>>cock<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>cunt<</if>>, $activeSlave.slaveName is not being very nice to $him at all.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<set $activeSlave.counter.penetrative++, $penetrativeTotal++>>
 		<<elseif ($activeSlave.fetish == "masochist") && ($activeSlave.fetishKnown == 1)>>
 			you prowl around $him to let $his masochistic anticipation build before nudging $him in the back of the knees. $He collapses helplessly and you drag $him over to the couch, slinging $him across its back and fucking $him without mercy. When the pleasurable pain loses its edge, you slide a finger into $him alongside your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>>, eliciting an appreciative shriek.
@@ -6684,19 +6531,11 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					<<set _didAnal = 1>>
 				<</if>>
 			<<elseif ($activeSlave.fetish == "cumslut")>>
-<<<<<<< HEAD
-				You push $him down to $his knees and <<if $PC.dick >= 1>>shove your cock down $his throat<<if $PC.vagina >= 1>> so far $he can almost reach your pussy with the tip of $his tongue<</if>><<else>>ride $his face<</if>>. $He pays no attention to the @@.green;mildly appreciative@@ stares from passersby, moaning into you as $he pleasures your <<if $PC.dick >= 1>>dick<<else>>cunt<</if>>.
-				<<run repX(250, "event", $activeSlave)>>
-				<<set $activeSlave.counter.oral++, $oralTotal++>>
-			<<elseif ($activeSlave.fetish == "humiliation")>>
-				You sit down on a balcony bench and pull $him down to sit on your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>>, and then pull $his legs as wide as they'll go as you fuck $him, displaying everything to the whole balcony<<if $activeSlave.belly >= 120000>>; $his _belly stomach hangs so low that it blocks the view, however<<else>><<if $PC.vagina >= 1>><<if $PC.dick >= 1>>: incidentally including your own pussy, which slides up and down as you piston the cock above it in and out of $him<</if>><</if>><</if>>. $He @@.hotpink;laps up@@ the @@.green;openly aroused@@ stares from $his growing audience.
-=======
 				You push $him down to $his knees and <<if $PC.dick != 0>>shove your cock down $his throat<<if $PC.vagina != -1>> so far $he can almost reach your pussy with the tip of $his tongue<</if>><<else>>ride $his face<</if>>. $He pays no attention to the @@.green;mildly appreciative@@ stares from passersby, moaning into you as $he pleasures your <<if $PC.dick != 0>>dick<<else>>cunt<</if>>.
 				<<run repX(250, "event", $activeSlave)>>
 				<<set $activeSlave.counter.oral++, $oralTotal++>>
 			<<elseif ($activeSlave.fetish == "humiliation")>>
 				You sit down on a balcony bench and pull $him down to sit on your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>>, and then pull $his legs as wide as they'll go as you fuck $him, displaying everything to the whole balcony<<if $activeSlave.belly >= 120000>>; $his _belly stomach hangs so low that it blocks the view, however<<else>><<if $PC.vagina != -1>><<if $PC.dick != 0>>: incidentally including your own pussy, which slides up and down as you piston the cock above it in and out of $him<</if>><</if>><</if>>. $He @@.hotpink;laps up@@ the @@.green;openly aroused@@ stares from $his growing audience.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<run repX(500, "event", $activeSlave)>>
 				<<set $activeSlave.devotion += 3>>
 				<<if canDoVaginal($activeSlave)>>
@@ -6730,11 +6569,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					<<set _didAnal = 1>>
 				<</if>>
 			<<elseif ($activeSlave.fetish == "dom")>>
-<<<<<<< HEAD
-				You shove $him back against a wall and seat your <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> inside $him before wrapping $his legs around you, taking a good grip on $his butt, and hauling $him off the wall again, holding $him in midair<<if $activeSlave.belly >= 600000>> (though $his _belly belly is resting on the ground)<</if>>. $He pays no attention to the @@.green;mildly appreciative@@ stares from passersby, concentrating on fucking as hard as $he possibly can.
-=======
 				You shove $him back against a wall and seat your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> inside $him before wrapping $his legs around you, taking a good grip on $his butt, and hauling $him off the wall again, holding $him in midair<<if $activeSlave.belly >= 600000>> (though $his _belly belly is resting on the ground)<</if>>. $He pays no attention to the @@.green;mildly appreciative@@ stares from passersby, concentrating on fucking as hard as $he possibly can.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<run repX(250, "event", $activeSlave)>>
 				<<if canDoVaginal($activeSlave)>>
 					<<set _didVaginal = 1>>
@@ -6840,11 +6675,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<else>>
 			soft
 		<</if>>
-<<<<<<< HEAD
-		back, but is accustomed to your touch and knows who you are. $He does not pause $his masturbation, knowing that if you want $him to, you'll tell $him. You take a moment to enjoy the warmth of the working slave's body before gently taking the hand $he's using to buttfuck $himself, <<if ($activeSlave.anus > 2)>>pulling the dildo free of $his relaxed asshole, and replacing it with your <<if $PC.dick >= 1>>prick<<else>>strap-on<</if>> before its gape can close.<<elseif ($activeSlave.anus > 1)>>pulling the dildo free of $his loose anus, and replacing it with your <<if $PC.dick >= 1>>prick<<else>>strap-on<</if>> before its gape can close.<<else>>pulling $his fingers free of $his tight little ass, and replacing them with your <<if $PC.dick >= 1>>prick<<else>>strap-on<</if>> while it's still relaxed.<</if>> $He moans into the pillow and pats around blindly with $his freed hand before finding your thigh and rubbing it affectionately. $He steps up $his humping and soon shudders,
-=======
 		back, but is accustomed to your touch and knows who you are. $He does not pause $his masturbation, knowing that if you want $him to, you'll tell $him. You take a moment to enjoy the warmth of the working slave's body before gently taking the hand $he's using to buttfuck $himself, <<if ($activeSlave.anus > 2)>>pulling the dildo free of $his relaxed asshole, and replacing it with your <<if $PC.dick != 0>>prick<<else>>strap-on<</if>> before its gape can close.<<elseif ($activeSlave.anus > 1)>>pulling the dildo free of $his loose anus, and replacing it with your <<if $PC.dick != 0>>prick<<else>>strap-on<</if>> before its gape can close.<<else>>pulling $his fingers free of $his tight little ass, and replacing them with your <<if $PC.dick != 0>>prick<<else>>strap-on<</if>> while it's still relaxed.<</if>> $He moans into the pillow and pats around blindly with $his freed hand before finding your thigh and rubbing it affectionately. $He steps up $his humping and soon shudders,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<if ($activeSlave.dick > 0) && !canAchieveErection($activeSlave)>>
 			releasing a pathetic spurt onto
 		<<elseif $activeSlave.balls > 3>>
@@ -6854,11 +6685,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<else>>
 			going limp and slumping down onto
 		<</if>>
-<<<<<<< HEAD
-		the sheets beneath $him. When you climax soon after, $he expects you to get off $him so $he can clean up, but instead, the <<if $PC.dick >= 1>>cock up $his butt returns to rock hardness<<if $PC.vagina >= 1>> as you use a little manual stimulation of your own cunt to get your cock stiff again<</if>> and<<else>>strap-on up $his butt<</if>> goes back to pumping in and out of $him. $He slides a hand under $himself to <<if $activeSlave.vagina == -1>>jerk off<<else>>rub $himself<</if>> this time. When you finally finish, a long time later, the exhausted slave is lying on a bed wet with lube, <<if ($PC.dick >= 1) || ($activeSlave.dick > 0)>> ejaculate,<</if>><<if ($PC.dick == 0) || ($activeSlave.vagina > -1)>> girlcum,<</if>> drool, and sweat. $He doesn't care, and you let $him curl up in $his sex-soaked nest. As you leave, you think $he's asleep already, but <<if !canSee($activeSlave)>>as you go<<else>>$his <<= App.Desc.eyeColor($activeSlave)>> eyes open a slit as you go and<</if>> $he murmurs, @@.hotpink;Thank<<s>>,@@ <<Master>>."
-=======
 		the sheets beneath $him. When you climax soon after, $he expects you to get off $him so $he can clean up, but instead, the <<if $PC.dick != 0>>cock up $his butt returns to rock hardness<<if $PC.vagina != -1>> as you use a little manual stimulation of your own cunt to get your cock stiff again<</if>> and<<else>>strap-on up $his butt<</if>> goes back to pumping in and out of $him. $He slides a hand under $himself to <<if $activeSlave.vagina == -1>>jerk off<<else>>rub $himself<</if>> this time. When you finally finish, a long time later, the exhausted slave is lying on a bed wet with lube, <<if ($PC.dick != 0) || ($activeSlave.dick > 0)>> ejaculate,<</if>><<if ($PC.dick == 0) || ($activeSlave.vagina > -1)>> girlcum,<</if>> drool, and sweat. $He doesn't care, and you let $him curl up in $his sex-soaked nest. As you leave, you think $he's asleep already, but <<if !canSee($activeSlave)>>as you go<<else>>$his <<= App.Desc.eyesColor($activeSlave)>> open a slit as you go and<</if>> $he murmurs, @@.hotpink;Thank<<s>>,@@ <<Master>>."
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.devotion += 5>>
 		<<= VCheck.Anal(5)>>
 	<</replace>>
@@ -6893,11 +6720,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				but $he is already licking $his lips with anticipation as you roll $him over and straddle $his chest so $he can <<if $PC.dick != 0>>suck you off<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>>. The orally fixated slut concentrates on the oral to a fault, so you take $his arm<<if hasBothArms($activeSlave)>>s<</if>> and straddle them too so $he can reach $himself and get back to masturbating. $He hums happily, a very fine sensation on <<if $PC.dick != 0>>shaft<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>pussylips<</if>>.
 				<<set $activeSlave.counter.oral++, $oralTotal++>>
 			<<elseif ($activeSlave.fetish == "humiliation")>>
-<<<<<<< HEAD
-				but $he complies as you pull $him up to kneel and take an assfuck. You let $him get used to it and then wordlessly turn $his head so $he can <<if canSee($activeSlave)>>see the screen in the room: it's now on, and it's showing a public live feed of your <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> penetrating $his anus. $He recognizes $himself immediately<<elseif canHear($activeSlave)>>listen to the screen in the room: it's now on, and it's showing a public live feed of your <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> penetrating $his anus. $He realizes the sounds of you fucking $his ass sync up with it<<else>>feel the wind blowing in from the large bay window you've opened<</if>>, and although the <<if canSee($activeSlave) || canHear($activeSlave)>>shot is such a closeup that the identity of the participants is not clear<<else>>likelihood is low that anyone on the arcology streets below would be looking up at this time<</if>>, the sheer humiliation of having $his rectum penetrated <<if canSee($activeSlave) || canHear($activeSlave)>>on camera<<else>>for all to see<</if>> brings $him to an indecently quick climax.
-=======
 				but $he complies as you pull $him up to kneel and take an assfuck. You let $him get used to it and then wordlessly turn $his head so $he can <<if canSee($activeSlave)>>see the screen in the room: it's now on, and it's showing a public live feed of your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> penetrating $his anus. $He recognizes $himself immediately<<elseif canHear($activeSlave)>>listen to the screen in the room: it's now on, and it's showing a public live feed of your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> penetrating $his anus. $He realizes the sounds of you fucking $his ass sync up with it<<else>>feel the wind blowing in from the large bay window you've opened<</if>>, and although the <<if canSee($activeSlave) || canHear($activeSlave)>>shot is such a closeup that the identity of the participants is not clear<<else>>likelihood is low that anyone on the arcology streets below would be looking up at this time<</if>>, the sheer humiliation of having $his rectum penetrated <<if canSee($activeSlave) || canHear($activeSlave)>>on camera<<else>>for all to see<</if>> brings $him to an indecently quick climax.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<set _didAnal = 1>>
 			<<elseif ($activeSlave.fetish == "buttslut")>>
 				but $he eagerly complies as you pull $him up to kneel and take an assfuck. You shove $his arm<<if hasBothArms($activeSlave)>>s<</if>> up over $his head to stop $his masturbation, confident that the anal whore can climax from nothing but your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> pumping in and out of $his butt. You're right, and $his sphincter tightens with orgasm even sooner than you expected it to. You roll $him over and go again,
@@ -7111,7 +6934,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<else>>
 			trim
 		<</if>>
-		bottom sink down into your lap. $He shimmies $himself atop your <<if $PC.dick == 0>>phallus<<else>>dick<</if>>, gently seating it between $his buttocks, and cranes $his neck back to kiss the bottom of your chin. $He gradually comes out of $his heat stupor, riding $himself back and forth more and more until the <<if ($activeSlave.anus > 2)>>slit of $his asspussy<<elseif ($activeSlave.anus > 1)>>opening of $his anus<<else>>pucker of $his butt<</if>> rests against your <<if $PC.dick == 0>>strongly vibrating strap-on<<else>>cock<</if>>. You take $his hips and firmly thrust into $his rectum, eliciting a little whimper, but $he begins to bounce gently in the water, sodomizing $himself, $his gigantic breasts moving up and down and making concentric ripples spread outward. $He's still very relaxed and $his first orgasm takes $him by surprise, <<if ($activeSlave.balls > 0)>>$his cum floating to the surface<<if canSee($activeSlave)>>; $he points at it and giggles<<else>>; $he feels it brush $his skin and giggles<</if>> before getting<<else>>making $him twitch and shudder with aftershocks as $he gets<</if>> $his feet up on the ledge to ride you harder. When you're done you let $him float again, but curiosity about how $his fucked butt feels under the water leads you to reach a hand <<if hasBothLegs($activeSlave)>>between $his legs<<else>>underneath $him<</if>> and grope $his anus. $His warm, relaxed <<if ($activeSlave.anus > 2)>>asspussy<<elseif ($activeSlave.anus > 1)>>backdoor<<else>>tightness<</if>> is so enticing you push $him to $his feet and take $him a second time, standing in the shoulder-depth water. By the time you're done $he's so @@.hotpink;sexually exhausted@@ that you carry $him to the shower.
+		bottom sink down into your lap. $He shimmies $himself atop your <<if $PC.dick == 0>>phallus<<else>>dick<</if>>, gently seating it between $his buttocks, and cranes $his neck back to kiss the bottom of your chin. $He gradually comes out of $his heat stupor, riding $himself back and forth more and more until the <<if ($activeSlave.anus > 2)>>slit of $his asspussy<<elseif ($activeSlave.anus > 1)>>opening of $his anus<<else>>pucker of $his butt<</if>> rests against your <<if $PC.dick == 0>>strongly vibrating strap-on<<else>>cock<</if>>. You take $his hips and firmly thrust into $his rectum, eliciting a little whimper, but $he begins to bounce gently in the water, sodomizing $himself, $his gigantic breasts moving up and down and making concentric ripples spread outward. $He's still very relaxed and $his first orgasm takes $him by surprise, <<if ($activeSlave.balls > 0)>>$his cum floating to the surface; <<if canSee($activeSlave)>>$he points at it and giggles<<else>>$he feels it brush $his skin and giggles<</if>> before getting<<else>>making $him twitch and shudder with aftershocks as $he gets<</if>> $his feet up on the ledge to ride you harder. When you're done you let $him float again, but curiosity about how $his fucked butt feels under the water leads you to reach a hand <<if hasBothLegs($activeSlave)>>between $his legs<<else>>underneath $him<</if>> and grope $his anus. $His warm, relaxed <<if ($activeSlave.anus > 2)>>asspussy<<elseif ($activeSlave.anus > 1)>>backdoor<<else>>tightness<</if>> is so enticing you push $him to $his feet and take $him a second time, standing in the shoulder-depth water. By the time you're done $he's so @@.hotpink;sexually exhausted@@ that you carry $him to the shower.
 		<<= VCheck.Anal(2)>>
 		<<set $activeSlave.devotion += 4>>
 	<</replace>>
@@ -7119,13 +6942,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <br><<link "Fuck $him under the water">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-		You gather some necessary items into a pool bag and step stealthily into the water, taking $him by an ankle and towing $him toward the deep end. "Hi, <<Master>>," comes a sleepy greeting from the slave as you pull $him through the water, $his boobs making twin bow waves. $He manages a shocked squeal as you quickly secure a weight belt <<if $activeSlave.belly >= 120000>>above $his<<else>>around $his<</if>><<if $activeSlave.belly >= 1500>> _belly<</if>> middle and drop $him, letting $him sink so swiftly that <<if ($activeSlave.butt > 5)>>$his massive bottom pads $him against a painful thump on<<elseif ($activeSlave.butt > 2)>>$his healthy bottom pads $him against a painful thump on<<else>>$his bottom receives a painful thump against<</if>> the bottom of the pool. Before $he can panic, $he feels your mouth against $his<<if ($activeSlave.lips > 70)>> dick sucking<<elseif ($activeSlave.lips > 20)>> lovely<</if>> lips, breathing for $him. You have two long, flexible snorkels designed for exactly this, but you keep $hers away from $him and breathe $his air into $him for a short time, and $he @@.mediumaquamarine;trusts@@ you enough to rely on you. When you finally give $him $his snorkel $he laughs, bubbles rising from around the mouthpiece, and then hugs you impulsively, intentionally giving you a huge faceful of boob. You pull $his weight belt down and tighten it around $his ankles so $he's pinned standing on the bottom, and then
-		<<if ($PC.vagina >= 1)>>
-=======
 		You gather some necessary items into a pool bag and step stealthily into the water, taking $him by an ankle and towing $him toward the deep end. "Hi, <<Master>>," comes a sleepy greeting from the slave as you pull $him through the water, $his boobs making twin bow waves. $He manages a shocked squeal as you quickly secure a weight belt <<if $activeSlave.belly >= 120000>>above $his<<else>>around $his<</if>><<if $activeSlave.belly >= 1500>> _belly<<elseif $activeSlave.weight > 95>> soft<</if>> middle and drop $him, letting $him sink so swiftly that <<if ($activeSlave.butt > 5)>>$his massive bottom pads $him against a painful thump on<<elseif ($activeSlave.butt > 2)>>$his healthy bottom pads $him against a painful thump on<<else>>$his bottom receives a painful thump against<</if>> the bottom of the pool. Before $he can panic, $he feels your mouth against $his<<if ($activeSlave.lips > 70)>> dick sucking<<elseif ($activeSlave.lips > 20)>> lovely<</if>> lips, breathing for $him. You have two long, flexible snorkels designed for exactly this, but you keep $hers away from $him and breathe $his air into $him for a short time, and $he @@.mediumaquamarine;trusts@@ you enough to rely on you. When you finally give $him $his snorkel $he laughs, bubbles rising from around the mouthpiece, and then hugs you impulsively, intentionally giving you a huge faceful of boob. You pull $his weight belt down and tighten it around $his ankles so $he's pinned standing on the bottom, and then
 		<<if ($PC.vagina != -1)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			spread $his knees so you can scissor your pussy against $him in the near-zero gravity, the tangle of limbs and breasts swaying gently as you grind.
 		<<else>>
 			insert yourself into the
@@ -7188,11 +7006,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				average breasts
 			<<elseif $PC.boobs >= 300>>
 				small breasts
-<<<<<<< HEAD
-			<<elseif $PC.boobs >= 1>>
-				breasts
-=======
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<elseif $PC.title == 0>>
 				flat chest
 			<<else>>
@@ -7204,11 +7017,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<else>>
 				$his lower back.
 			<</if>>
-<<<<<<< HEAD
-			$He automatically begins to rub $himself up and down to stimulate you; once $he feels you reach <<if $PC.dick == 0>>full arousal<<else>>rock hardness<<if $PC.vagina >= 1>> and total wetness<</if>><</if>> $he
-=======
 			$He automatically begins to rub $himself up and down to stimulate you; once $he feels you reach <<if $PC.dick == 0>>full arousal<<else>>rock hardness<<if $PC.vagina != -1>> and total wetness<</if>><</if>> $he
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if $activeSlave.height >= 170>>
 				leans into the rail, bending over it just slightly to offer $his asshole at just the right height.
 			<<else>>
@@ -7233,15 +7042,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				big<<if $PC.boobsImplant != 0>> firm<</if>> breasts
 			<<elseif $PC.boobs >= 800>>
 				breasts
-<<<<<<< HEAD
-			<<elseif $PC.boobsBonus == -2>>
-				average breasts
-			<<elseif $PC.boobsBonus == -3>>
-				average breasts
-			<<elseif $PC.boobs >= 1>>
-=======
 			<<elseif $PC.boobs >= 650>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				breasts
 			<<elseif $PC.boobs >= 500>>
 				average breasts
@@ -7629,15 +7430,9 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<replace "#result">>
 			There's a glint <<if canSee($activeSlave)>>in $his eyes as $he sees<<elseif canHear($activeSlave)>>on $his face as $he hears<<else>>on $his face as $he senses<</if>> you stand up from your desk and saunter over;
 			<<if $activeSlave.height >= 185>>
-<<<<<<< HEAD
-				$he's tall enough for standing <<if $PC.vagina >= 1>>sex<<else>>anal<</if>>, so as you approach $he just readies $himself to fuck $his lover.
-			<<elseif $activeSlave.height < 160>>
-				$he's so short standing anal is a stretch, so once you approach you get down on your knees and greet the dick that will soon be in your <<if $PC.vagina >= 1>>pussy<<else>>asshole<</if>>.
-=======
 				$he's tall enough for standing <<if $PC.vagina != -1>>sex<<else>>anal<</if>>, so as you approach $he just readies $himself to fuck $his lover.
 			<<elseif $activeSlave.height < 160>>
 				$he's so short standing anal is a stretch, so once you approach you get down on your knees and greet the dick that will soon be in your <<if $PC.vagina != -1>>pussy<<else>>asshole<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<else>>
 				$he's shorter than you, so as you approach $he goes up on tiptoe to bring $his dick to just the right height for standing sex.
 			<</if>>
@@ -7667,11 +7462,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<</if>>
 			/* .vagina trainwreck ahead */
 			<<if $activeSlave.dick == 1>>
-<<<<<<< HEAD
-				<<if $PC.vagina >= 1>>
-=======
 				<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					<<if $PC.newVag == 1>>
 						$He slips $his tiny dick into your vagina. Fortunately your custom cunt is capable of making even the most embarrassing of dicks pleasurable; though you wish $he could fill you a little better.
 					<<elseif $PC.career == "escort">>
@@ -7693,11 +7484,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					You have to check to see if $he's even in your tight rear, only to find $he is already fully hilted. You sigh as $he thrusts into you: no prostate stimulation today.
 				<</if>>
 			<<elseif $activeSlave.dick == 2>>
-<<<<<<< HEAD
-				<<if $PC.vagina >= 1>>
-=======
 				<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					<<if $PC.newVag == 1>>
 						$He slips $his cute dick into your vagina. Fortunately your custom cunt is capable of making $his embarrassing offering pleasurable; though you wish $he could fill you a little better.
 					<<elseif $PC.career == "escort">>
@@ -7719,11 +7506,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					You sigh as you feel $him slip $his cute dick into your tight rear; no prostate stimulation today.
 				<</if>>
 			<<elseif $activeSlave.dick == 3>>
-<<<<<<< HEAD
-				<<if $PC.vagina >= 1>>
-=======
 				<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					<<if $PC.newVag == 1>>
 						You shudder as $he slips $his dick into your vagina.
 					<<elseif $PC.career == "escort">>
@@ -7743,17 +7526,10 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					<</if>>
 				<<else>>
 					You squirm as you feel $him slip $his dick into your tight rear, the sensation making you quiver with pleasure.
-<<<<<<< HEAD
-					<<if $PC.dick >= 1>>Your erection firmly <<if $PC.belly >= 10000>>pushes into the underside of your belly<<else>>sticks out from under you<</if>>, overstimulated from $his cock teasing your prostate.<</if>>
-				<</if>>
-			<<elseif $activeSlave.dick == 4>>
-				<<if $PC.vagina >= 1>>
-=======
 					<<if $PC.dick != 0>>Your erection firmly <<if $PC.belly >= 10000>>pushes into the underside of your belly<<else>>sticks out from under you<</if>>, overstimulated from $his cock teasing your prostate.<</if>>
 				<</if>>
 			<<elseif $activeSlave.dick == 4>>
 				<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					<<if $PC.newVag == 1>>
 						You shudder as $he slips $his big dick into your vagina.
 					<<elseif $PC.career == "escort">>
@@ -7796,17 +7572,10 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					<</if>>
 				<<else>>
 					You grit your teeth as you feel $his slip $his impressive dick into your tight rear, stretching you considerably. You bring a hand to your lower belly, feeling the bulge of $his cock deep within you. $He gives you a chance to get used to $his size before continuing, not that it will help much.
-<<<<<<< HEAD
-					<<if $PC.dick >= 1>>Your erection firmly <<if $PC.belly >= 10000>>pushes into the underside of your belly<<else>>sticks out from under you<</if>>, overstimulated from $his cock teasing your prostate.<</if>>
-				<</if>>
-			<<elseif $activeSlave.dick == 6>>
-				<<if $PC.vagina >= 1>>
-=======
 					<<if $PC.dick != 0>>Your erection firmly <<if $PC.belly >= 10000>>pushes into the underside of your belly<<else>>sticks out from under you<</if>>, overstimulated from $his cock teasing your prostate.<</if>>
 				<</if>>
 			<<elseif $activeSlave.dick == 6>>
 				<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					<<if $PC.newVag == 1>>
 						You shudder with overwhelming pleasure as $his huge dick fills you completely.
 					<<elseif $PC.career == "escort">>
@@ -7826,11 +7595,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					<</if>>
 				<<else>>
 					You cry out as $he forces $his huge dick into your too-tight rear, nearly breaking you. $He considers pulling back out, but you pat the bulge in your lower belly and urge $him to continue. $He tries $his best to allow you to get comfortable, not that it will help much.
-<<<<<<< HEAD
-					<<if $PC.dick >= 1>>Your erection firmly <<if $PC.belly >= 10000>>pushes into the underside of your belly<<else>>sticks out from under you<</if>>, overstimulated from $his cock teasing your prostate.<</if>>
-=======
 					<<if $PC.dick != 0>>Your erection firmly <<if $PC.belly >= 10000>>pushes into the underside of your belly<<else>>sticks out from under you<</if>>, overstimulated from $his cock teasing your prostate.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<</if>>
 			<<elseif $activeSlave.dick == 7>> /* needs to be written */
 				gigantic dick
@@ -7843,11 +7608,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<else>>
 				hypertrophied dick
 			<</if>>
-<<<<<<< HEAD
-			$He gently fucks you<<if $activeSlave.balls > 8>>, $his oversized balls slapping your thighs with every thrust<</if>>, making sure you're enjoying $his penis as much as physically possible. You climax as $he cums inside eliciting a gasp from the horny $girl<<if $PC.dick >= 1>>, as you spurt across the floor<</if>>. $He apologizes profusely for cumming in you, but after $he helps clean you up and back to your desk, all is forgiven. As you work, you can't help but steal glances at $his renewed erection. $He winks
-=======
 			$He gently fucks you<<if $activeSlave.balls > 8>>, $his oversized balls slapping your thighs with every thrust<</if>>, making sure you're enjoying $his penis as much as physically possible. You climax as $he cums inside eliciting a gasp from the horny $girl<<if $PC.dick != 0>>, as you spurt across the floor<</if>>. $He apologizes profusely for cumming in you, but after $he helps clean you up and back to your desk, all is forgiven. As you work, you can't help but steal glances at $his renewed erection. $He winks
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if !canTalk($activeSlave)>>
 				and @@.mediumaquamarine;earnestly asks@@ for more when you get the chance.
 			<<else>>
@@ -8277,15 +8038,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<replace "#result">>
 			You tell $him that you understand, and that you will get $him some new clothing. $He is thrilled, but $his pleasure turns to horror when $he sees that the new clothes are a version of the same slave bondage gear, just with inward-facing dildos for $his <<if $activeSlave.vagina > -1>>pussy and <</if>> asshole.
 			<<if $activeSlave.anus == 0 || $activeSlave.vagina == 0>>
-<<<<<<< HEAD
-				You pause before getting $him dressed; there's little reason to waste virginities on plugs. You <<if $PC.dick >= 1>>stroke yourself to erection<<else>>don a strap-on<</if>> and bend $him over, opting to start with $his tight pussy.
-				<<= VCheck.Both()>>
-			<<elseif $activeSlave.anus == 0>>
-				You pause before getting $him dressed; there's little reason to waste $his anal virginity on a plug. You <<if $PC.dick >= 1>>stroke yourself to erection<<else>>don a strap-on<</if>> and bend $him over before working your way into $his tight anus.
-				<<= VCheck.Anal()>>
-			<<elseif $activeSlave.vagina == 0>>
-				You pause before getting $him dressed; there's little reason to waste $his virginity on a plug. You <<if $PC.dick >= 1>>stroke yourself to erection<<else>>don a strap-on<</if>> and bend $him over before working your way into $his tight pussy.
-=======
 				You pause before getting $him dressed; there's little reason to waste virginities on plugs. You <<if $PC.dick != 0>>stroke yourself to erection<<else>>don a strap-on<</if>> and bend $him over, opting to start with $his tight pussy.
 				<<= VCheck.Both()>>
 			<<elseif $activeSlave.anus == 0>>
@@ -8293,7 +8045,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<<= VCheck.Anal()>>
 			<<elseif $activeSlave.vagina == 0>>
 				You pause before getting $him dressed; there's little reason to waste $his virginity on a plug. You <<if $PC.dick != 0>>stroke yourself to erection<<else>>don a strap-on<</if>> and bend $him over before working your way into $his tight pussy.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<= VCheck.Vaginal()>>
 			<</if>>
 			For the rest of the week, $he walks around awkwardly, unable to find a comfortable position <<if $activeSlave.belly >= 1500>>between<<else>>since<</if>> $his <<if $seeRace == 1>>$activeSlave.race <</if>>body <<if $activeSlave.belly >= 1500>>is<</if>> being penetrated by $his own clothing<<if $activeSlave.belly >= 1500>> and the straps digging into $his _belly rounded belly<</if>>. @@.hotpink;$He has become more submissive.@@
@@ -8783,11 +8534,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<<set $activeSlave.trust -= 5>>
 <</link>>
 <<if $PC.belly < 5000>>
-<<<<<<< HEAD
-	<<if $PC.dick >= 1 && (canDoAnal($activeSlave) || canDoVaginal($activeSlave)) && canWalk($activeSlave)>>
-=======
 	<<if $PC.dick != 0 && (canDoAnal($activeSlave) || canDoVaginal($activeSlave)) && canWalk($activeSlave)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<br><<link "Exploit $his need for personal contact">>
 			<<EventNameDelink $activeSlave>>
 			<<replace "#result">>
@@ -8838,11 +8585,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<</replace>>
 		<</link>><<if ($activeSlave.anus == 0 && canDoAnal($activeSlave)) || ($activeSlave.vagina == 0 && canDoVaginal($activeSlave))>> //This option will take $his virginity//<</if>>
 	<</if>>
-<<<<<<< HEAD
-	<<if $PC.vagina >= 1>>
-=======
 	<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<br><<link "Exploit $his need for personal contact by giving $him a pussy to lick">>
 			<<EventNameDelink $activeSlave>>
 			<<replace "#result">>
@@ -8852,11 +8595,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<</link>>
 	<</if>>
 <</if>>
-<<<<<<< HEAD
-<<if $PC.preg > 30 && $PC.pregMood == 1 && $PC.boobs >= 1 && $PC.boobsImplant == 0 && $PC.boobsBonus >= 0>>
-=======
 <<if $PC.preg > 30 && $PC.pregMood == 1 && $PC.boobs >= 800 && $PC.boobsImplant == 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<br><<link "$He just needs a mother's touch">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
@@ -8973,11 +8712,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<</if>>
 			<<else>>
 				sinking your cock into $his
-<<<<<<< HEAD
-				<<if !canDoVaginal($activeSlave)>>now-slick butthole<<else>>now-slick pussy<<if canDoAnal($activeSlave)>> and then $his relaxing butthole<</if>><</if>><<if $PC.vagina >= 1>>, followed by some grinding to coat $his face in your pussyjuice<</if>>.
-=======
 				<<if !canDoVaginal($activeSlave)>>now-slick butthole<<else>>now-slick pussy<<if canDoAnal($activeSlave)>> and then $his relaxing butthole<</if>><</if>><<if $PC.vagina != -1>>, followed by some grinding to coat $his face in your pussyjuice<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<</if>>
 			$He had fun, though, and $his @@.hotpink;trust in you has increased.@@
 			<<= VCheck.Both()>>
@@ -9044,15 +8779,9 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<else>>
 				$He does so diligently, making sure to not miss <<if $showInches == 2>>an inch<<else>>a centimeter<</if>> while keeping your enjoyment above all else.
 			<</if>>
-<<<<<<< HEAD
-		<<elseif $PC.dick >= 1>>
-			your erect dick and commenting on how it could use a good cleaning. $He carefully takes your cock into $his mouth, doing $his best to bring you to a quick orgasm so $he can escape your gaze. After downing your cum, $he attempts to pull back, but you hold $him down, clearly $he has more work to do here.
-		<<elseif $PC.vagina >= 1>>
-=======
 		<<elseif $PC.dick != 0>>
 			your erect dick and commenting on how it could use a good cleaning. $He carefully takes your cock into $his mouth, doing $his best to bring you to a quick orgasm so $he can escape your gaze. After downing your cum, $he attempts to pull back, but you hold $him down, clearly $he has more work to do here.
 		<<elseif $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			your soaked pussy and commenting on how someone needs to clean up after it, preferably with their tongue. $He carefully $his tongue to your clit, doing $his best to bring you to a quick orgasm so $he can escape your gaze. After bring you to a rather unsatisfying climax, $he attempts to pull back, but you grab $him and force $him to lick the depths of your pussy.
 		<</if>>
 		By the time you are satisfied with $his efforts, $he @@.hotpink;has become more submissive to you.@@
@@ -9144,11 +8873,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<</replace>>
 	<</link>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>> //This option will take $his virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0)>> //This option will take $his anal virginity//<</if>>
 <</if>>
-<<<<<<< HEAD
-<<if ($PC.dick >= 1) && (canDoAnal($activeSlave) || canDoVaginal($activeSlave)) && $PC.belly < 100>>
-=======
 <<if ($PC.dick != 0) && (canDoAnal($activeSlave) || canDoVaginal($activeSlave)) && $PC.belly < 100>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<br><<link "Carry $him outside">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
@@ -9206,11 +8931,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <<link "It's $his role to hurt">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-		Without a word, you<<if $PC.dick == 0>> don a cruelly knobby strap-on,<</if>> throw $him onto the couch, take both $his ankles in one hand, and force them back over $his head so $his poor, doomed asshole is completely defenseless. You then spit on $his hole, seize your <<if $PC.dick == 0>>instrument<<else>>rock-hard dick<<if $PC.vagina >= 1>>, gather a little of your own pussyjuice and rub it on your cockhead<</if>><</if>>, and shove it up the wriggling slave $girl's spasming rectum. You've got the necessary skill to judge exactly where the line between anal pain and anal injury is, and you take $his right up to it. Halfway through the long anal rape $he gives up struggling and just goes limp, sobbing. $He @@.hotpink;fears you,@@ and has also begun to @@.red;hate buttsex.@@
-=======
 		Without a word, you<<if $PC.dick == 0>> don a cruelly knobby strap-on,<</if>> throw $him onto the couch, take both $his ankles in one hand, and force them back over $his head so $his poor, doomed asshole is completely defenseless. You then spit on $his hole, seize your <<if $PC.dick == 0>>instrument<<else>>rock-hard dick<<if $PC.vagina != -1>>, gather a little of your own pussyjuice and rub it on your cockhead<</if>><</if>>, and shove it up the wriggling slave $girl's spasming rectum. You've got the necessary skill to judge exactly where the line between anal pain and anal injury is, and you take $his right up to it. Halfway through the long anal rape $he gives up struggling and just goes limp, sobbing. $He @@.hotpink;fears you,@@ and has also begun to @@.red;hate buttsex.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.trust -= 5, $activeSlave.sexualFlaw = "hates anal", $activeSlave.counter.anal++, $analTotal++>>
 	<</replace>>
 <</link>>
@@ -9463,11 +9184,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <<link "Relaxed sex">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-		You flip the sheet off your naked body, revealing your already <<if $PC.dick == 0>>wet pussy<<else>>stiff prick<<if $PC.vagina >= 1>> and the wet pussy below it<</if>><</if>>. $He slides $himself down, pressing $his
-=======
 		You flip the sheet off your naked body, revealing your already <<if $PC.dick == 0>>wet pussy<<else>>stiff prick<<if $PC.vagina != -1>> and the wet pussy below it<</if>><</if>>. $He slides $himself down, pressing $his
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<if ($activeSlave.boobs > 2000)>>
 			ridiculous tits
 		<<elseif ($activeSlave.boobs > 800)>>
@@ -9632,11 +9349,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<else>>
 				buttfucked,
 			<</if>>
-<<<<<<< HEAD
-			is enough that $he climaxes quickly. <<if $activeSlave.balls == 3>>$His huge load coats the shower wall with cum. <</if>>You pull out and let $him finish by <<if $PC.dick == 0>>giving you oral<<else>>sucking your dick<<if $PC.vagina >= 1>> and eating your pussy<</if>><</if>>, since $he started by sucking $himself. @@.hotpink;$He has become more submissive to you.@@
-=======
 			is enough that $he climaxes quickly. <<if $activeSlave.balls == 3>>$His huge load coats the shower wall with cum. <</if>>You pull out and let $him finish by <<if $PC.dick == 0>>giving you oral<<else>>sucking your dick<<if $PC.vagina != -1>> and eating your pussy<</if>><</if>>, since $he started by sucking $himself. @@.hotpink;$He has become more submissive to you.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<set $activeSlave.devotion += 4>>
 			<<if canDoVaginal($activeSlave)>>
 				<<if ($activeSlave.vagina == 0)>>
@@ -9690,11 +9403,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				sodomy,
 			<</if>>
 			so $he is soon moaning and grunting into $his cock as you fuck $him.
-<<<<<<< HEAD
-			$He finishes <<if $activeSlave.balls >= 3>>$his enormous ejaculation <</if>>into $his own mouth and then <<if $PC.dick == 0>>finds $himself giving you oral directly, since you pulled your strap-on off<<else>>receives your load into $his now-brimming throat<<if $PC.vagina >= 1>>. $He barely has time to swallow before you press your pussy against $his mouth<</if>><</if>>. @@.hotpink;$His devotion to you has increased.@@
-=======
 			$He finishes <<if $activeSlave.balls >= 3>>$his enormous ejaculation <</if>>into $his own mouth and then <<if $PC.dick == 0>>finds $himself giving you oral directly, since you pulled your strap-on off<<else>>receives your load into $his now-brimming throat<<if $PC.vagina != -1>>. $He barely has time to swallow before you press your pussy against $his mouth<</if>><</if>>. @@.hotpink;$His devotion to you has increased.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<set $activeSlave.devotion += 4>>
 		<</replace>>
 	<</link>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>>//This option will take $his virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0)>> //This option will take $his anal virginity//<</if>>
@@ -9730,11 +9439,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<else>>
 			"Really, <<if $activeSlave.rudeTitle == 1>><<= PoliteRudeTitle($activeSlave)>><<else>><<Master>><</if>>?" $he asks hopefully.
 		<</if>>
-<<<<<<< HEAD
-		You whisper into $his ear that yes, $he will be all right as long as $he does $his best. $He wiggles $his butt against you a little and giggles <<if $PC.dick >= 1>>at the responding stiffness $he feels between $his buttocks<<else>>as you shove $him to $his knees<</if>>. $He shimmies down and <<if $PC.dick >= 1>>takes you into $his mouth<<if $PC.vagina >= 1>> and does $his best to reach the top of your pussy with the tip of $his tongue<</if>><<else>>eats you out<</if>>, <<if canSee($activeSlave)>>looking you in the eyes the whole time and <</if>>@@.hotpink;smiling@@ as much as $he can manage with <<if $PC.dick >= 1>>a dick in $his mouth<<else>>$his tongue working your clit<</if>>.
-=======
 		You whisper into $his ear that yes, $he will be all right as long as $he does $his best. $He wiggles $his butt against you a little and giggles <<if $PC.dick != 0>>at the responding stiffness $he feels between $his buttocks<<else>>as you shove $him to $his knees<</if>>. $He shimmies down and <<if $PC.dick != 0>>takes you into $his mouth<<if $PC.vagina != -1>> and does $his best to reach the top of your pussy with the tip of $his tongue<</if>><<else>>eats you out<</if>>, <<if canSee($activeSlave)>>looking you in the eyes the whole time and <</if>>@@.hotpink;smiling@@ as much as $he can manage with <<if $PC.dick != 0>>a dick in $his mouth<<else>>$his tongue working your clit<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.devotion += 4, $activeSlave.counter.oral++, $oralTotal++>>
 	<</replace>>
 <</link>>
@@ -9959,11 +9664,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<else>>
 			hard, so you just lie down with $him on the couch<<if ($activeSlave.chastityVagina)>>, unfasten $his chastity belt,<</if>>
 		<</if>>
-<<<<<<< HEAD
-		and have gentle vaginal sex in the missionary position <<if $PC.vagina >= 1>><<if $PC.dick >= 1>>, your own pussy moving back and forth gently at the base of your dick as you fuck $him<</if>><</if>>. $He gasps at the first penetration, but you take it slowly and lavish attention on $his lips, breasts, and nipples. Soon $he's shamelessly enjoying $himself. $His first vaginal sex is crowned with an abdominal-clenching orgasm. $He @@.hotpink;adores $his kind <<= WrittenMaster()>>.@@
-=======
 		and have gentle vaginal sex in the missionary position <<if $PC.vagina != -1>><<if $PC.dick != 0>>, your own pussy moving back and forth gently at the base of your dick as you fuck $him<</if>><</if>>. $He gasps at the first penetration, but you take it slowly and lavish attention on $his lips, breasts, and nipples. Soon $he's shamelessly enjoying $himself. $His first vaginal sex is crowned with an abdominal-clenching orgasm. $He @@.hotpink;adores $his kind <<= WrittenMaster()>>.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.devotion += 10, $activeSlave.counter.vaginal++, $activeSlave.vagina = 1, $vaginalTotal++>>
 		<<if $activeSlave.chastityVagina == 1>><<set $activeSlave.chastityVagina = 0>><</if>>
 		<<if canImpreg($activeSlave, $PC)>>
@@ -10048,11 +9749,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<else>>
 			shakes with release
 		<</if>>
-<<<<<<< HEAD
-		after just a few strokes of your <<if $PC.dick == 0>>strap-on<<else>>dick<</if>> up $his butt. $His <<if ($activeSlave.anus > 2)>>gaping<<elseif ($activeSlave.anus > 1)>>loose<<else>>tight<</if>> ass spasms and tightens with $his climax<<if $PC.dick >= 1>>, a wonderful sensation<</if>>. You aren't finished with $him, but $he rubs $himself languidly and enjoys the hard anal reaming more than $he ever has previously. $His devotion to you @@.hotpink;has increased.@@
-=======
 		after just a few strokes of your <<if $PC.dick == 0>>strap-on<<else>>dick<</if>> up $his butt. $His <<if ($activeSlave.anus > 2)>>gaping<<elseif ($activeSlave.anus > 1)>>loose<<else>>tight<</if>> ass spasms and tightens with $his climax<<if $PC.dick != 0>>, a wonderful sensation<</if>>. You aren't finished with $him, but $he rubs $himself languidly and enjoys the hard anal reaming more than $he ever has previously. $His devotion to you @@.hotpink;has increased.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.devotion += 4>>
 		<<= VCheck.Anal()>>
 	<</replace>>
@@ -10376,11 +10073,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <br><<link "Force obedience using pain">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-		You shove $his unresisting<<if $activeSlave.belly >= 5000>> <<if $activeSlave.bellyPreg >= 3000>>gravid<<else>>swollen<</if>><</if>> body over the couch and seize $his ballsack. When $he feels your tight grip $he spasms and tries to pull away reflexively, but goes limp when $he feels the agony of a warning squeeze. You fasten a tight rubber ring around the base of $his sack, leaving $him writhing on the couch in considerable discomfort. After letting $him wriggle for a while, you tell $him that $he can have it off when $he gets you off. $He scrabbles for your <<if $PC.dick == 0>>pussy and desperately starts to perform cunnilingus; after a while you get bored and ride $his face. You finally climax<<else>>dick and starts to desperately suck you off<<if $PC.vagina >= 1>> and eat you out<</if>>; you let $him work for a while before getting bored and adding painful slaps to $his cheeks. You blow your load down $his throat<</if>> and then stand, <<if canSee($activeSlave)>>brandishing the knife<<else>>swishing the knife through the air<</if>>. <<if canSee($activeSlave)>>$His eyes are huge<<else>>$He grimaces<</if>> with terror, but $he holds still. $His private parts have gone so numb that $he has to <<if canSee($activeSlave)>>look down<<else>>run $his hand across $his scrotum<</if>> in trepidation to verify that you cut the rubber, not $him. $He leaves with the pins and needles working their agonizing way back into $him along with the blood flow to $his balls, promising tearfully to @@.gold;stay out of trouble.@@
-=======
 		You shove $his unresisting<<if $activeSlave.belly >= 5000>> <<if $activeSlave.bellyPreg >= 3000>>gravid<<else>>swollen<</if>><</if>> body over the couch and seize $his ballsack. When $he feels your tight grip $he spasms and tries to pull away reflexively, but goes limp when $he feels the agony of a warning squeeze. You fasten a tight rubber ring around the base of $his sack, leaving $him writhing on the couch in considerable discomfort. After letting $him wriggle for a while, you tell $him that $he can have it off when $he gets you off. $He scrabbles for your <<if $PC.dick == 0>>pussy and desperately starts to perform cunnilingus; after a while you get bored and ride $his face. You finally climax<<else>>dick and starts to desperately suck you off<<if $PC.vagina != -1>> and eat you out<</if>>; you let $him work for a while before getting bored and adding painful slaps to $his cheeks. You blow your load down $his throat<</if>> and then stand, <<if canSee($activeSlave)>>brandishing the knife<<else>>swishing the knife through the air<</if>>. <<if canSee($activeSlave)>>$His eyes are huge<<else>>$He grimaces<</if>> with terror, but $he holds still. $His private parts have gone so numb that $he has to <<if canSee($activeSlave)>>look down<<else>>run $his hand across $his scrotum<</if>> in trepidation to verify that you cut the rubber, not $him. $He leaves with the pins and needles working their agonizing way back into $him along with the blood flow to $his balls, promising tearfully to @@.gold;stay out of trouble.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.trust -= 5, $activeSlave.counter.oral++, $oralTotal++>>
 	<</replace>>
 <</link>>
@@ -10404,11 +10097,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <br><<link "See how rough you can be and still get $him to cum">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-		The aphrodisiac dosage $he's on will let $him orgasm to almost anything. You spend a few minutes playing with $his nipples, skillfully edging $him away from climax, and $he's almost vibrating with discomfort. $He's so desperate that $he sobs with relief when you order $him to <<if ($activeSlave.heels == 1) && ($activeSlave.shoes != "heels")>>kneel<<elseif ($activeSlave.shoes == "heels")>>totter up<<else>>stand<</if>> <<if $activeSlave.belly >= 5000>>_belly belly <</if>>against a wall and spread $his buttocks. A little saliva and<<if $PC.vagina >= 1>> a bit of your own pussyjuice, transferred by a couple of fingers, and<</if>> <<if $PC.dick == 0>>your vibrating strap-on<<else>>your dick<</if>> is up $his willing ass. The position is uncomfortable for $him, and you are not gentle, but $he comes anyway. By the end of the night $his butthole is so sore that $he <<if $activeSlave.belly >= 5000>>lies on $his side<<else>>lies on $his stomach<</if>> every chance $he gets. $His submissiveness @@.hotpink;has increased.@@
-=======
 		The aphrodisiac dosage $he's on will let $him orgasm to almost anything. You spend a few minutes playing with $his nipples, skillfully edging $him away from climax, and $he's almost vibrating with discomfort. $He's so desperate that $he sobs with relief when you order $him to <<if ($activeSlave.heels == 1) && ($activeSlave.shoes != "heels")>>kneel<<elseif ($activeSlave.shoes == "heels")>>totter up<<else>>stand<</if>> <<if $activeSlave.belly >= 5000>>_belly belly <</if>>against a wall and spread $his buttocks. A little saliva and<<if $PC.vagina != -1>> a bit of your own pussyjuice, transferred by a couple of fingers, and<</if>> <<if $PC.dick == 0>>your vibrating strap-on<<else>>your dick<</if>> is up $his willing ass. The position is uncomfortable for $him, and you are not gentle, but $he comes anyway. By the end of the night $his butthole is so sore that $he <<if $activeSlave.belly >= 5000>>lies on $his side<<else>>lies on $his stomach<</if>> every chance $he gets. $His submissiveness @@.hotpink;has increased.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.devotion += 4>>
 	<</replace>>
 <</link>>
@@ -10496,11 +10185,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				$his loosened vagina
 				<<set _didVaginal = 1>>
 			<</if>>
-<<<<<<< HEAD
-			<<if $PC.vagina >= 1>> and make $him eat your pussy for a quick aftershock,<</if>>
-=======
 			<<if $PC.vagina != -1>> and make $him eat your pussy for a quick aftershock,<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<</if>>
 		and only then do you help $him back to $his feet. $He drips soap, water, and <<if $PC.dick == 0>>your juices<<else>>ejaculate<</if>>. @@.hotpink;$He has become more submissive.@@
 		<<if _didVaginal == 1 && _didAnal == 1>>
@@ -10545,11 +10230,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<set $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 65, $activeSlave.fetish = "pregnancy">>
 		<</if>>
 		<<set $activeSlave.devotion += 3, $activeSlave.trust += 3, $activeSlave.vagina = 1, $activeSlave.counter.vaginal++, $vaginalTotal++>>
-<<<<<<< HEAD
-		<<if $PC.dick >= 1 && $activeSlave.eggType == "human" && canGetPregnant($activeSlave)>>
-=======
 		<<if $PC.dick != 0 && $activeSlave.eggType == "human" && canGetPregnant($activeSlave)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<= knockMeUp($activeSlave, 15, 0, -1)>>
 		<</if>>
 	<</replace>>
@@ -10563,11 +10244,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<set $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 65, $activeSlave.fetish = "submissive">>
 		<</if>>
 		<<set $activeSlave.trust -= 5, $activeSlave.vagina = 1, $activeSlave.counter.vaginal++, $vaginalTotal++>>
-<<<<<<< HEAD
-		<<if $PC.dick >= 1 && $activeSlave.eggType == "human" && isFertile($activeSlave) && $activeSlave.preg == 0>>
-=======
 		<<if $PC.dick != 0 && $activeSlave.eggType == "human" && isFertile($activeSlave) && $activeSlave.preg == 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<= knockMeUp($activeSlave, 25, 0, -1)>>
 		<</if>>
 	<</replace>>
@@ -10582,11 +10259,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<if $activeSlave.vagina > 0 && canDoVaginal($activeSlave)>>
 			$His shivers reach a crescendo when you <<if $PC.dick == 0>>scissor yourself against<<else>>enter<</if>> $his warm, wet pussy, which convulsively flexes against your <<if $PC.dick == 0>>clit<<else>>rock hard dick<</if>>.
 		<<else>>
-<<<<<<< HEAD
-			<<if $PC.dick == 0>>You ride $his face,<<else>>You push your dick<<if $PC.vagina >= 1>> and as much of the upper part of your pussy as you can manage<</if>> between $his thighs for some frottage,<</if>> lavishing attention on $his nipples to ensure that $he has fun, too.
-=======
 			<<if $PC.dick == 0>>You ride $his face,<<else>>You push your dick<<if $PC.vagina != -1>> and as much of the upper part of your pussy as you can manage<</if>> between $his thighs for some frottage,<</if>> lavishing attention on $his nipples to ensure that $he has fun, too.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<</if>>
 		$He leaves your office feeling @@.hotpink;very close to $his <<= WrittenMaster()>> indeed,@@ and seems to have forgotten $his unfucked butthole for now.
 		<<set $activeSlave.devotion += 4>>
@@ -10610,11 +10283,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<set $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 65, $activeSlave.fetish = "buttslut">>
 		<</if>>
 		<<set $activeSlave.devotion += 3, $activeSlave.trust += 3, $activeSlave.anus = 1, $activeSlave.counter.anal++, $analTotal++>>
-<<<<<<< HEAD
-		<<if $PC.dick >= 1 && $activeSlave.eggType == "human" && isFertile($activeSlave) && $activeSlave.preg == 0>>
-=======
 		<<if $PC.dick != 0 && $activeSlave.eggType == "human" && isFertile($activeSlave) && $activeSlave.preg == 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<= knockMeUp($activeSlave, 15, 1, -1)>>
 		<</if>>
 	<</replace>>
@@ -10696,11 +10365,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<br><<link "Assrape $him">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
-<<<<<<< HEAD
-			You order $him to kneel. $He looks hopeful and complies, but $his anticipation of enjoyable sex vanishes with a pathetic little gasp when you<<if $PC.dick == 0>> don a strap-on and<</if>> <<if $PC.vagina >= 1>>use a couple of fingers to collect some of your pussyjuice for improvised lube<<else>>spit on $his butthole<</if>>. With only a little saliva as lubrication, you brutally sodomize $him, fucking $his <<if $seeRace == 1>>$activeSlave.race <</if>>ass to the limit of what you can get away with without damaging $him.
-=======
 			You order $him to kneel. $He looks hopeful and complies, but $his anticipation of enjoyable sex vanishes with a pathetic little gasp when you<<if $PC.dick == 0>> don a strap-on and<</if>> <<if $PC.vagina != -1>>use a couple of fingers to collect some of your pussyjuice for improvised lube<<else>>spit on $his butthole<</if>>. With only a little saliva as lubrication, you brutally sodomize $him, fucking $his <<if $seeRace == 1>>$activeSlave.race <</if>>ass to the limit of what you can get away with without damaging $him.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if (($activeSlave.fetish == "buttslut" && $activeSlave.fetishStrength > 60) || ($activeSlave.energy > 95)) && ($activeSlave.fetishKnown == 1)>>
 				$He loves anal so much that after a while pleasure overwhelms pain to the extent that $he manages a @@.hotpink;sobbing orgasm.@@
 			<<else>>
@@ -10870,11 +10535,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<case "incubus">>
 			using _hisA hands to make a heart shape around _hisA erection as _heA thrusts.
 		<<case "succubus">>
-<<<<<<< HEAD
-			<<if $PC.dick >= 1>>forms an "O" with _hisA lips and makes exaggerated head bobbing motions<<else>>forms a "V" with _hisA fingers and wiggles _hisA tongue in it<</if>>.
-=======
 			<<if $PC.dick != 0>>forms an "O" with _hisA lips and makes exaggerated head bobbing motions<<else>>forms a "V" with _hisA fingers and wiggles _hisA tongue in it<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<case "imp">>
 			flapping around and cackling manically.
 		<<case "witch">>
@@ -11011,19 +10672,11 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<</if>>
 			I need it <<s>>o bad right now, plea<<s>>e rip off my cha<<s>>tity and fuck me <<s>>en<<s>>ele<<ss>>."
 		<</if>>
-<<<<<<< HEAD
-		A vague hint of embarrassment at begging for <<if $PC.dick >= 1>>a hard<<if $PC.vagina >= 1>>futa<</if>> dicking<<else>>your strap-on<</if>> flickers across $his face, but hope for sexual release extinguishes it quickly.
-		<br><br>
-		<<if canDoAnal($activeSlave) || canDoVaginal($activeSlave)>>
-			$He groans with relief as your <<if $PC.dick >= 1>>cock<<else>>phallus<</if>> enters $him. $He does not orgasm immediately, but $he knows sweet release is coming. You have $him atop your desk, on $his back, and $he's participating in $his own sexual degradation by holding $his legs spread wide apart for you. "Ohh," $he moans as you fuck $him, "thank you for telling me why I feel thi<<s>> way, <<Master>>. I gue<<ss>> thi<<s>> i<<s>> how I, oh, am now? Oh, oh, it feel<<s>> <<s>>o g-good! Ye<<s>>! AHH!"
-			<<if $PC.dick >= 1>>
-=======
 		A vague hint of embarrassment at begging for <<if $PC.dick != 0>>a hard<<if $PC.vagina != -1>>futa<</if>> dicking<<else>>your strap-on<</if>> flickers across $his face, but hope for sexual release extinguishes it quickly.
 		<br><br>
 		<<if canDoAnal($activeSlave) || canDoVaginal($activeSlave)>>
 			$He groans with relief as your <<if $PC.dick != 0>>cock<<else>>phallus<</if>> enters $him. $He does not orgasm immediately, but $he knows sweet release is coming. You have $him atop your desk, on $his back, and $he's participating in $his own sexual degradation by holding $his legs spread wide apart for you. "Ohh," $he moans as you fuck $him, "thank you for telling me why I feel thi<<s>> way, <<Master>>. I gue<<ss>> thi<<s>> i<<s>> how I, oh, am now? Oh, oh, it feel<<s>> <<s>>o g-good! Ye<<s>>! AHH!"
 			<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				$His
 				<<if ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>>
 					cunt
@@ -11115,11 +10768,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
 			You observe, noncommittally, that $he seems ready to get off.
-<<<<<<< HEAD
-			"Ye<<s>> <<Master>>!" $he squeals, too <<if $activeSlave.intelligence+$activeSlave.intelligenceImplant >= -50>>horny<<else>>stupid<</if>> to notice the sarcasm. Sighing inwardly, you slide yourself back from your desk and glance downward significantly, indicating your <<if $PC.dick >= 1>>dick<<if $PC.vagina >= 1>> and pussy<</if>><<else>>girl parts<</if>>. $He hurries over, almost throwing $himself at your feet in $his eagerness. "Touch yourself", you say, making it an imperious command rather than kind permission. $He moans into your <<if $PC.dick >= 1>>cock<<else>>cunt<</if>> with gratitude as $he
-=======
 			"Ye<<s>> <<Master>>!" $he squeals, too <<if $activeSlave.intelligence+$activeSlave.intelligenceImplant >= -50>>horny<<else>>stupid<</if>> to notice the sarcasm. Sighing inwardly, you slide yourself back from your desk and glance downward significantly, indicating your <<if $PC.dick != 0>>dick<<if $PC.vagina != -1>> and pussy<</if>><<else>>girl parts<</if>>. $He hurries over, almost throwing $himself at your feet in $his eagerness. "Touch yourself", you say, making it an imperious command rather than kind permission. $He moans into your <<if $PC.dick != 0>>cock<<else>>cunt<</if>> with gratitude as $he
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if canDoVaginal($activeSlave)>>
 				<<if $activeSlave.dick > 0 && !($activeSlave.chastityPenis)>>
 					wraps one hand around $his dick and slips the other into $his pussy.
@@ -11164,11 +10813,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				brings $his hand<<if hasBothArms($activeSlave)>>s<</if>> to $his breasts to <<if $activeSlave.nipples != "fuckable">>tease $his erect<<else>>finger $his swollen<</if>> nipples.
 			<</if>>
 			<br><br>
-<<<<<<< HEAD
-			$He's extremely pent up, and orgasms twice with <<if $PC.dick >= 1>>your dick in $his mouth<<if $PC.vagina >= 1>> first and $his tongue quivering along your pussylips second<</if>><<else>>$his mouth on your cunt<</if>>. The mental effects of this formative little experience are impossible to control with precision. Over the next few days, you notice that whenever <<if canSee($activeSlave)>>$he sees you<<else>>you see $him<</if>>,
-=======
 			$He's extremely pent up, and orgasms twice with <<if $PC.dick != 0>>your dick in $his mouth<<if $PC.vagina != -1>> first and $his tongue quivering along your pussylips second<</if>><<else>>$his mouth on your cunt<</if>>. The mental effects of this formative little experience are impossible to control with precision. Over the next few days, you notice that whenever <<if canSee($activeSlave)>>$he sees you<<else>>you see $him<</if>>,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if (random(0,1) == 1)>>
 				$he licks $his lips unconsciously. $He seems to be developing the beginnings of a lovely @@.lightcoral;oral fixation.@@
 				<<set $activeSlave.fetish = "cumslut", $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 10>>
@@ -11185,11 +10830,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<br><<link "Make $him cum like a girl">>
 			<<EventNameDelink $activeSlave>>
 			<<replace "#result">>
-<<<<<<< HEAD
-				You order $him to get $his ass up on your desk. $He obeys, though not without a flicker of trepidation. $He points $his butt at you like a sex slave should, and doesn't crane around to see what you're doing behind $him, but $he's stiff with the awareness that <<if $PC.dick >= 1>>there's almost certainly a hard<<if $PC.vagina >= 1>> futa<</if>> dick about<<else>>you're almost certainly donning a strap-on<</if>> to slide inside $his girly asspussy. $He's not wrong, and $he lets out a little moan as <<if $PC.dick >= 1>>your cockhead<<if $PC.vagina >= 1>>, which you kindly lubed with a bit of your pussyjuice,<</if>><<else>>its broad tip<</if>> <<if $activeSlave.anus > 2>>slides easily inside $his whorish anus<<elseif $activeSlave.anus == 2>>slides up $his experienced butthole<<else>>forces its way inside $his tight sphincter<</if>>.
-=======
 				You order $him to get $his ass up on your desk. $He obeys, though not without a flicker of trepidation. $He points $his butt at you like a sex slave should, and doesn't crane around to <<if canSee($activeSlave)>>see<<else>>feel<</if>> what you're doing behind $him, but $he's stiff with the awareness that <<if $PC.dick != 0>>there's almost certainly a hard<<if $PC.vagina != -1>> futa<</if>> dick about<<else>>you're almost certainly donning a strap-on<</if>> to slide inside $his girly asspussy. $He's not wrong, and $he lets out a little moan as <<if $PC.dick != 0>>your cockhead<<if $PC.vagina != -1>>, which you kindly lubed with a bit of your pussyjuice,<</if>><<else>>its broad tip<</if>> <<if $activeSlave.anus > 2>>slides easily inside $his whorish anus<<elseif $activeSlave.anus == 2>>slides up $his experienced butthole<<else>>forces its way inside $his tight sphincter<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<br><br>
 				As you fuck $him, you pull $his torso up so you can play with $his <<if $activeSlave.boobs > 2000>>udders<<elseif $activeSlave.boobs > 800>>tits<<else>>nipples<</if>> and whisper manipulation into $his ear. You tell $him $he's about to cum like a girl. $He says nothing, but $his body language communicates incomprehension. Girls, you tell $him, cum when they get fucked. They cum when <<if $PC.title == 1>>guys<<else>>their betters<</if>> stick dick inside them. $He bursts into tears, sobbing with shame and degradation even as $he shakes and <<if $activeSlave.balls > 0>>squirts cum<<else>>dribbles ejaculate<</if>>. The next time $he sees you,
 				<<if (random(0,1) == 1)>>
@@ -11206,11 +10847,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<br><<link "Work on broadening $his sexual horizons">>
 			<<EventNameDelink $activeSlave>>
 			<<replace "#result">>
-<<<<<<< HEAD
-				$He seems a little too focused on $his hot cunt. You order $him to get up on your desk, and $he obeys eagerly, $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes shining<<else>>facial expression filled<</if>> with lust. <<if canSee($activeSlave)>>They focus<<else>>$He focuses<</if>> on <<if $PC.dick >= 1>>your cock as you bring it to bear<<if $PC.vagina >= 1>>, not to mention the pussy at its base<</if>><<else>>your strap-on as you step into it<</if>>, and $he's about to express $his gratitude when you push the slave, who is sitting on the edge of your desk with $his legs spread to provide you access to $his pussy, over onto $his back. $He barely has time to reorient $himself when $he feels <<if $activeSlave.anus > 2>>a sudden fullness in $his loose ass<<elseif $activeSlave.anus == 2>>a presence inside $his experienced ass<<else>>something starting to push its way up $his poor little bottom<</if>>.
-=======
 				$He seems a little too focused on $his hot cunt. You order $him to get up on your desk, and $he obeys eagerly, $his <<if canSee($activeSlave)>><<= App.Desc.eyesColor($activeSlave)>> shining<<else>>facial expression filled<</if>> with lust. <<if canSee($activeSlave)>>They focus<<else>>$He focuses<</if>> on <<if $PC.dick != 0>>your cock as you bring it to bear<<if $PC.vagina != -1>>, not to mention the pussy at its base<</if>><<else>>your strap-on as you step into it<</if>>, and $he's about to express $his gratitude when you push the slave, who is sitting on the edge of your desk with $his legs spread to provide you access to $his pussy, over onto $his back. $He barely has time to reorient $himself when $he feels <<if $activeSlave.anus > 2>>a sudden fullness in $his loose ass<<elseif $activeSlave.anus == 2>>a presence inside $his experienced ass<<else>>something starting to push its way up $his poor little bottom<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<br><br>
 				$He cannot hide $his disappointment, but has the presence of mind not to protest as you assfuck $him hard enough that $his <<if $activeSlave.boobs > 2000>>ridiculous tits almost hit $him in the face with each stroke<<elseif $activeSlave.boobs > 800>>big boobs bounce all over the place<<else>>boobs bounce<</if>><<if $activeSlave.belly >= 10000>> and taut belly is forced back<</if>>. $His orgasm sneaks up on $him, and comes by surprise, forcing a squeal out of $him as $his sphincter tightens down involuntarily. $He gets up gingerly, clearly feeling sore,
 				<<if (random(0,1) == 1)>>
@@ -11248,15 +10885,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		waist. Your hands, thus freed to grope $him, tenderly hold $his head and neck instead, cupping $his <<if $activeSlave.face > 95>>gorgeous<<elseif $activeSlave.face >= -10>>pretty<<else>>homely<</if>> jawline and making $him moan at the intimacy.
 		<br><br>
 		$He's completely forgotten $his troubles, and you see that it stays that way. You consider yourself something of an expert on human stimulation at this point, and you manage $hers expertly. (Admittedly, you're also cheating, using discreet scanning of $his vital signs to check on $his state of arousal.) Whenever $he's in danger of achieving an erection, which would remind $him of $his chastity cage with a twinge of discomfort, you cool your makeout session off slightly, massaging $him capably instead of kissing $him deeply. After some time, $he shudders, to $his own complete surprise and to your unsurprised satisfaction. $He's just done what in a normal sexual encounter would be considered premature ejaculation, since you wrought $him to such a subtle state of arousal that $he got off without really getting hard. $He can muster no coherent response, but @@.mediumaquamarine;hugs you convulsively,@@ sobbing into your
-<<<<<<< HEAD
-		<<if $PC.boobsBonus > 2>>
-			enormous<<if $PC.boobsImplant == 1>> fake<</if>> breasts
-		<<elseif $PC.boobsBonus == 2>>
-			huge<<if $PC.boobsImplant == 1>> fake<</if>> breasts
-		<<elseif $PC.boobsBonus == 1>>
-			big<<if $PC.boobsImplant == 1>> firm<</if>> breasts
-		<<elseif $PC.boobs >= 1>>
-=======
 		<<if $PC.boobs >= 1400>>
 			enormous<<if $PC.boobsImplant != 0>> fake<</if>> breasts
 		<<elseif $PC.boobs >= 1200>>
@@ -11264,7 +10892,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<elseif $PC.boobs >= 1000>>
 			big<<if $PC.boobsImplant != 0>> firm<</if>> breasts
 		<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			boobs
 		<<elseif $arcologies[0].FSPhysicalIdealist != "unset">>
 			strong shoulder
@@ -11284,11 +10911,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<<replace "#result">>
 		You agree, on the condition that $he be a good little bitch like $he promised. $He thanks you frantically, following you with mixed relief, gratitude, and deep terror as you lead $him to the surgery. It's a medically simple procedure, but $he's @@.red;retained for recovery@@ for some time, a common precaution in your penthouse where the surgery affects an area that might be reinjured by sexual use without a short break for the curatives to take effect. When the medical equipment verifies that $he can be fucked without pain or danger to $his health, you order $him to come back up to your office. $He is a @@.hotpink;very good little bitch,@@
 		<<if canDoAnal($activeSlave)>>
-<<<<<<< HEAD
-			taking <<if $PC.dick >= 1>>a hard buttfuck<<else>>a hard anal fingerfuck<</if>> with apparent enthusiasm and a strong orgasm, though of course $his continued use of a chastity cage conceals almost all the effects.
-=======
 			taking <<if $PC.dick != 0>>a hard buttfuck<<else>>a hard anal fingerfuck<</if>> with apparent enthusiasm and a strong orgasm, though of course $his continued use of a chastity cage conceals almost all the effects.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<= VCheck.Anal()>>
 		<<else>>
 			enduring all of your teasing without the slightest hint of an erection. Even though $his chastity blocks the use of $his ass, you still focus most of your attention on $his rear for the day the belt comes off.
@@ -12008,11 +11631,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<<else>>
 					rolls onto $his face to hump $himself against $his hand, against the desk.
 				<</if>>
-<<<<<<< HEAD
-				<<if $PC.dick == 0>>After the momentary pause of your climax, you<<if $PC.vagina >= 1>> use a little manual stimulation of your pussy to force yourself to total hardness again and<</if>> resume thrusting<<else>>Your cum leaks out of $his used cunt and onto $his working hand<</if>>; $his acceptance of sexual slavery @@.hotpink;has increased.@@
-=======
 				<<if $PC.dick == 0>>After the momentary pause of your climax, you<<if $PC.vagina != -1>> use a little manual stimulation of your pussy to force yourself to total hardness again and<</if>> resume thrusting<<else>>Your cum leaks out of $his used cunt and onto $his working hand<</if>>; $his acceptance of sexual slavery @@.hotpink;has increased.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<= VCheck.Vaginal(5)>>
 			<<elseif canDoAnal($activeSlave)>>
 				For the rest of the week, $he can come to you and offer you $his <<if ($activeSlave.anus > 3)>>hopelessly gaped rectum<<elseif ($activeSlave.anus > 2)>>big slit of an asspussy<<elseif ($activeSlave.anus > 1)>>nice asspussy<<else>>tight asshole<</if>>; $he will be allowed to masturbate after, but only after, you are finished with $him. $He nods through $his tears and <<if $activeSlave.belly >= 10000>>struggles to get<<else>>hurriedly gets<</if>> up on your desk, lying on $his side and using one hand to spread $his buttocks apart while the other is poised to touch $himself. $He starts crying a little with relief as $he feels you slowly insert <<if $PC.dick == 0>>a strap-on<<else>>your cock<</if>> into $his spasming rectum. You are not gentle, and despite the anal stimulation $he does not orgasm by the time you <<if $PC.dick == 0>>climax to the vibrations of the strap-on, and the pleasure of buttfucking a bitch<<else>>blow your load in $his ass<</if>>. $He's so eager to get off $he doesn't bother to move, and just
@@ -12021,17 +11640,10 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<<else>>
 					rolls onto $his face to hump $himself against $his hand, against the desk.
 				<</if>>
-<<<<<<< HEAD
-				<<if $PC.dick == 0>>After the momentary pause of your climax, you<<if $PC.vagina >= 1>> use a little manual stimulation of your pussy to force yourself to total hardness again and<</if>> resume thrusting<<else>>Your cum leaks out of $his used backdoor and onto $his working hand<</if>>; $his acceptance of sexual slavery @@.hotpink;has increased.@@
-				<<= VCheck.Anal(5)>>
-			<<else>>
-				For the rest of the week, $he can come to you and politely ask to <<if $PC.dick >= 1>>suck you off<<else>>eat you out<</if>>; $he will be allowed to masturbate after, but only after, you are satisfied. $He nods through $his tears and
-=======
 				<<if $PC.dick == 0>>After the momentary pause of your climax, you<<if $PC.vagina != -1>> use a little manual stimulation of your pussy to force yourself to total hardness again and<</if>> resume thrusting<<else>>Your cum leaks out of $his used backdoor and onto $his working hand<</if>>; $his acceptance of sexual slavery @@.hotpink;has increased.@@
 				<<= VCheck.Anal(5)>>
 			<<else>>
 				For the rest of the week, $he can come to you and politely ask to <<if $PC.dick != 0>>suck you off<<else>>eat you out<</if>>; $he will be allowed to masturbate after, but only after, you are satisfied. $He nods through $his tears and
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<if $activeSlave.belly >= 300000>>
 					leans over $his _belly stomach,
 				<<else>>
@@ -12042,21 +11654,13 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					<</if>>
 					to $his knees,
 				<</if>>
-<<<<<<< HEAD
-				where $he brings $his face to your <<if $PC.dick >= 1>>erect cock<<else>>moist pussy<</if>> and $his hand to $his crotch. $He starts crying a little with relief as $he feels you slowly <<if $PC.dick == 0>>push your slit against<<else>>insert your cock into<</if>> $his mouth. You are not gentle, and by the time you <<if $PC.dick >= 1>>blow your load down $his throat<<else>>splash $his face with your girlcum<</if>>, $he still hasn't reached $his climax. $He's so eager to get off $he doesn't bother to move, and just humps $himself against $his hand, against
-=======
 				where $he brings $his face to your <<if $PC.dick != 0>>erect cock<<else>>moist pussy<</if>> and $his hand to $his crotch. $He starts crying a little with relief as $he feels you slowly <<if $PC.dick == 0>>push your slit against<<else>>insert your cock into<</if>> $his mouth. You are not gentle, and by the time you <<if $PC.dick != 0>>blow your load down $his throat<<else>>splash $his face with your girlcum<</if>>, $he still hasn't reached $his climax. $He's so eager to get off $he doesn't bother to move, and just humps $himself against $his hand, against
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<if $activeSlave.belly >= 300000>>
 					$his belly.
 				<<else>>
 					your leg.
 				<</if>>
-<<<<<<< HEAD
-				<<if $PC.dick == 0>>After the momentary pause of your climax, you<<if $PC.vagina >= 1>> use a little manual stimulation of your pussy to force yourself to total hardness again and<</if>> resume thrusting<<else>>After the momentary pause of your climax, you pull $his face back to your crotch for a second round<</if>>; $his acceptance of sexual slavery @@.hotpink;has increased.@@
-=======
 				<<if $PC.dick == 0>>After the momentary pause of your climax, you<<if $PC.vagina != -1>> use a little manual stimulation of your pussy to force yourself to total hardness again and<</if>> resume thrusting<<else>>After the momentary pause of your climax, you pull $his face back to your crotch for a second round<</if>>; $his acceptance of sexual slavery @@.hotpink;has increased.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<set $activeSlave.counter.oral += 5, $oralTotal += 5>>
 			<</if>>
 			<<set $activeSlave.devotion += 4>>
@@ -12151,11 +11755,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<else>>
 				$He does, but the simple movement is agonizing and $he shrieks in spite of $himself.
 			<</if>>
-<<<<<<< HEAD
-			You slide <<if $PC.dick >= 1>>your turgid cock<<else>>a big strap-on<</if>> into $him and seize $him by $his
-=======
 			You slide <<if $PC.dick != 0>>your turgid cock<<else>>a big strap-on<</if>> into $him and seize $him by $his
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if $activeSlave.weight > 160>>
 				extremely well padded
 			<<elseif $activeSlave.weight > 95>>
@@ -12175,15 +11775,9 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			"Plea<<s>>e, <<Master>>! AAAH! It hurt<<s>>! It AAAH hurt<<s>> <<s>>-<<s>>o b-baAAAH!"
 			It hurts so badly, in fact, that $he doesn't seem to notice what you're doing to $his lower half, other than the motion it produces in $his upper half. Amused by the realization,
 			<<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
-<<<<<<< HEAD
-				you pull your <<if $PC.dick >= 1>>dick<<else>>phallus<</if>> out of $him and shove it up $his butthole without warning.
-			<<else>>
-				you insert a couple of fingers alongside your <<if $PC.dick >= 1>>dick<<else>>phallus<</if>>.
-=======
 				you pull your <<if $PC.dick != 0>>dick<<else>>phallus<</if>> out of $him and shove it up $his butthole without warning.
 			<<else>>
 				you insert a couple of fingers alongside your <<if $PC.dick != 0>>dick<<else>>phallus<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<</if>>
 			$He just goes on screaming about how much $his boobs hurt. Eventually, you tire of $his bellowing, so you reach around and pop <<if $activeSlave.nipples != "fuckable">>$his nipples out one by one<<else>>finger into each nipple<</if>>. The shrieking reaches a paroxysm, but once they're <<if $activeSlave.nipples != "fuckable">>protruded<<else>>opened<</if>>, the milk begins to jet out of $him in a pair of uninterrupted streams. $He collapses forward onto $his face, crying with relief as the pain in $his breasts recedes. As it does, $he finally begins to notice
 			<<if canDoAnal($activeSlave)>>
@@ -12322,11 +11916,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<else>>
 				You scoop $activeSlave.slaveName's limbless form up and carry $him out.
 			<</if>>
-<<<<<<< HEAD
-			You take $him to a lovely open balcony and seat yourself on a bench surrounded by the lush greenery and flowing water of $arcologies[0].name's food systems. You pull $his ass down onto your <<if $PC.dick == 0>>strap-on<<else>>rigid cock<</if>> so $he can offer everything else to the public.<<if $PC.vagina >= 1>><<if $PC.dick >= 1>> They know not to presume to use the pussy located beneath your thrusting cock.<</if>><</if>>
-=======
 			You take $him to a lovely open balcony and seat yourself on a bench surrounded by the lush greenery and flowing water of $arcologies[0].name's food systems. You pull $his ass down onto your <<if $PC.dick == 0>>strap-on<<else>>rigid cock<</if>> so $he can offer everything else to the public.<<if $PC.vagina != -1>><<if $PC.dick != 0>> They know not to presume to use the pussy located beneath your thrusting cock.<</if>><</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if canDoVaginal($activeSlave)>>
 				For several hours, citizens come and go, most choosing to fuck $his wet and available pussy. You climax repeatedly from the <<if $PC.dick == 0>>titillating nature of<<else>>extra fullness of $his butt during<</if>> double penetration, and by the time you're finished $he's dripping ejaculate from both $his holes.
 			<<elseif $activeSlave.belly >= 120000>>
@@ -12512,16 +12102,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<<else>>
 					play with $himself as much as $he can manage
 				<</if>>
-<<<<<<< HEAD
-				as $his asshole takes its first fuck of the night. You let $him change positions between each slave, and by the end $he's draped limply across the arm of your chair so $he can tiredly <<if $PC.vagina >= 1>>nibble your pussylips<<else>>suck on your balls one at a time<</if>> as the last few slaves, taking advantage of $his enormously gaped butt, slide lubricated hands in and out of $his rectum while giggling at the perversion and playing with each other. As the final slave withdraws their hand, $activeSlave.slaveName crawls into your lap and burrows $his face
-				<<if $PC.boobsBonus > 2>>
-					between your enormous<<if $PC.boobsImplant == 1>> fake<</if>> breasts
-				<<elseif $PC.boobsBonus == 2>>
-					between your huge<<if $PC.boobsImplant == 1>> fake<</if>> breasts
-				<<elseif $PC.boobsBonus == 1>>
-					between your big<<if $PC.boobsImplant == 1>> firm<</if>> breasts
-				<<elseif $PC.boobs >= 1>>
-=======
 				as $his asshole takes its first fuck of the night. You let $him change positions between each slave, and by the end $he's draped limply across the arm of your chair so $he can tiredly <<if $PC.vagina != -1>>nibble your pussylips<<else>>suck on your balls one at a time<</if>> as the last few slaves, taking advantage of $his enormously gaped butt, slide lubricated hands in and out of $his rectum while giggling at the perversion and playing with each other. As the final slave withdraws their hand, $activeSlave.slaveName crawls into your lap and burrows $his face
 				<<if $PC.boobs >= 1400>>
 					between your enormous<<if $PC.boobsImplant != 0>> fake<</if>> breasts
@@ -12530,7 +12110,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<<elseif $PC.boobs >= 1000>>
 					between your big<<if $PC.boobsImplant != 0>> firm<</if>> breasts
 				<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					between your breasts
 				<<elseif $PC.title == 0>>
 					into your flat chest
@@ -12661,15 +12240,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				tight
 			<</if>>
 			butt. You hug $him up and into you, crushing $his <<if $activeSlave.boobs > 2000>>titanic<<elseif $activeSlave.boobs > 800>>big<<else>>small<</if>> breasts against
-<<<<<<< HEAD
-			<<if $PC.boobsBonus > 2>>
-				your enormous <<if $PC.boobsImplant == 1>>balloons<<else>>bust<</if>>.
-			<<elseif $PC.boobsBonus == 2>>
-				your huge <<if $PC.boobsImplant == 1>>balloons<<else>>bust<</if>>.
-			<<elseif $PC.boobsBonus == 1>>
-				your big <<if $PC.boobsImplant == 1>>balloons<<else>>bust<</if>>.
-			<<elseif $PC.boobs >= 1>>
-=======
 			<<if $PC.boobs >= 1400>>
 				your enormous <<if $PC.boobsImplant != 0>>balloons<<else>>bust<</if>>.
 			<<elseif $PC.boobs >= 1200>>
@@ -12677,7 +12247,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<elseif $PC.boobs >= 1000>>
 				your big <<if $PC.boobsImplant != 0>>balloons<<else>>bust<</if>>.
 			<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				yours.
 			<<elseif $PC.title == 0>>
 				your flat ones.
@@ -12975,13 +12544,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				"Plea<<s>>e, would you play with my boob<<s>>, <<Master>>?" $He sticks out $his chest and bounces $his breasts for you, lest you misunderstand. You could play with $his boobs, and you do, managing mammary intercourse several ways.
 				<<set $activeSlave.counter.mammary += 3, $mammaryTotal += 3>>
 			<<case "pregnancy">>
-<<<<<<< HEAD
-				<<if ($activeSlave.toyHole == "dick" || $sexualOpeness == 1) && canPenetrate($activeSlave) && $PC.vagina >= 1>>
-					<<if isPlayerFertile($PC)>>
-=======
 				<<if ($activeSlave.toyHole == "dick" || $sexualOpeness == 1) && canPenetrate($activeSlave) && $PC.vagina != -1>>
 					<<if canGetPregnant($PC)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 						"Plea<<s>>e, can I try to get you pregnant, <<Master>>?" $His eyes are glued to your middle. You could let $him seed you, and you do, enjoying the feeling of $his hot cum jetting into your fertile pussy.
 						<<if canImpreg($PC, $activeSlave)>>
 							<<= knockMeUp($PC, 20, 0, $activeSlave.ID)>>
@@ -12999,11 +12563,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					<<set $activeSlave.counter.penetrative++, $penetrativeTotal++>>
 				<<else>>
 					<<if canDoVaginal($activeSlave) || canDoAnal($activeSlave)>>
-<<<<<<< HEAD
-						"Plea<<s>>e, would you <<if $PC.dick >= 1>>fill me with your <<s>>eed<<else>>fuck me<</if>>, <<Master>>?" $He reclines on the couch and offers $himself to you, lest you misunderstand. You could <<if $PC.dick >= 1>>fill $him with your seed<<else>>fuck $him<</if>>, and you do.
-=======
 						"Plea<<s>>e, would you <<if $PC.dick != 0>>fill me with your <<s>>eed<<else>>fuck me<</if>>, <<Master>>?" $He reclines on the couch and offers $himself to you, lest you misunderstand. You could <<if $PC.dick != 0>>fill $him with your seed<<else>>fuck $him<</if>>, and you do.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 						<<if canDoVaginal($activeSlave)>>
 							<<= VCheck.Vaginal()>>
 						<<else>>
@@ -13378,11 +12938,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			huge sweaty boobs.
 		<<elseif $PC.boobs >= 1000>>
 			big sweaty boobs.
-<<<<<<< HEAD
-		<<elseif $PC.boobs >= 1>>
-=======
 		<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			sweaty boobs.
 		<<else>>
 			<<if $PC.title == 0>>
@@ -13396,11 +12952,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<if canDoVaginal($activeSlave) || canDoAnal($activeSlave)>>
 				<<link "Fuck $him right here">>
 					<<replace "#result2">>
-<<<<<<< HEAD
-						<<if $PC.title == 0 || $PC.boobs >= 1 || $PC.belly >= 1500>>
-=======
 						<<if $PC.title == 0 || $PC.boobs >= 300 || $PC.belly >= 1500>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 							Despite your feminine appearance, you have capable hands.
 						<<else>>
 							You have strong hands to go with your masculine appeal.
@@ -13511,20 +13063,12 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					You tell your quivering sex toy that $he doesn't have to be embarrassed about $his needs. @@.mediumaquamarine;$He seems relieved@@ that the sexual being $he's becoming is acceptable, at least to you.
 					<<set $activeSlave.trust += 4>>
 				<</replace>>
-<<<<<<< HEAD
-			<</link>><<if (($activeSlave.anus == 0 && canDoAnal($activeSlave)) || ($activeSlave.vagina == 0) && canDoVaginal($activeSlave)) && ($PC.dick >= 1)>> //This option will take $his virginity//<</if>>
-=======
 			<</link>><<if (($activeSlave.anus == 0 && canDoAnal($activeSlave)) || ($activeSlave.vagina == 0) && canDoVaginal($activeSlave)) && ($PC.dick != 0)>> //This option will take $his virginity//<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<</if>>
 		<br><<link "Have $him lick you clean">>
 			<<replace "#result2">>
 				You take $him by the hand and <<if $PC.belly >= 10000>>waddle<<else>>walk<</if>> towards the shower. The sudden loss of your closeness jerks $him rudely out of $his sexual reverie, but $he follows willingly, perhaps distracted by the view as you shed your workout clothes on the way. When you get there, you pull $him in with you, but you do not turn on the water. Instead, you tell $him to wash you. Not understanding, $he turns to switch on the shower, but you catch $him, and insert two sweaty fingers into the slave's compliant mouth. $He sucks on them, taking refuge in the simple task, and then understands what you mean. $He runs $his tongue up your arm, sucking the salty sweat off you as best $he can. Soon, $he bends down and heads for your
-<<<<<<< HEAD
-				<<if $PC.dick >= 1>>cock<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>cunt<</if>>
-=======
 				<<if $PC.dick != 0>>cock<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>cunt<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				but you pull $him up again and tell $him to do that last.
 				<<if $PC.belly >= 60000>>
 					$He quickly finds something almost as good by licking and sucking $his way up your linea nigra. When $he reaches your <<if $PC.preg >= 22>>popped<<else>>flattened<</if>> navel, you hold $his head there for a while, savoring the erotic sensation before pushing $him along to the rest of your expansive midriff.
@@ -13536,11 +13080,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					$He quickly finds something almost as good by licking and sucking $his way up the sweaty crevice between your huge breasts. When $he reaches your nipples, you hold $his head there for a while, enjoying $his tongue.
 				<<elseif $PC.boobs >= 1000>>
 					$He quickly finds something almost as good by licking and sucking $his way up the sweaty crevice between your big breasts. When $he reaches your nipples, you hold $his head there for a while, enjoying $his tongue.
-<<<<<<< HEAD
-				<<elseif $PC.boobs >= 1>>
-=======
 				<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					$He quickly finds something almost as good by licking and sucking $his way up the sweaty crevice between your breasts. When $he reaches your nipples, you hold $his head there for a while, enjoying $his tongue.
 				<<else>>
 					<<if $PC.title == 0>>
@@ -13553,11 +13093,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<<if $PC.dick == 0>>
 					cunt, and $he eats you out with enthusiasm
 				<<else>>
-<<<<<<< HEAD
-					stiff prick, and $he gives you an enthusiastic blowjob<<if $PC.vagina >= 1>> before turning $his oral attentions to your pussy<</if>>
-=======
 					stiff prick, and $he gives you an enthusiastic blowjob<<if $PC.vagina != -1>> before turning $his oral attentions to your pussy<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<</if>>
 				as the water plays over you both. After looking up and letting the water cascade down your face for a long moment, you quietly tell $him to masturbate before opening your mouth to drink from the downpour. With your eyes closed against the stream, your only indications that $he's obeying the command is a slight increase in the force with which $he sucks, and a faint
 				<<if canDoVaginal($activeSlave)>>
@@ -13873,11 +13409,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<<else>>
 					ass,
 				<</if>>
-<<<<<<< HEAD
-				leading $him like a music teacher guiding a student's hands. When $he's groping your buttocks properly, you grind against $him for a while, grinning to yourself as you feel an unwilling erection building between your cheeks. Pleased, you lean forward and line up your <<if $PC.vagina >= 1>>pussy<<else>>asshole<</if>> with $his dick head and push back into $him. You repeat until $his hips start moving on their own. You bite on your finger at the sensation of $his cock inside you and, using your other hand, begin to jerk yourself off. Except for your vigorous stroking with one hand, there's little to indicate to $him that you have a dick; it must feel as though $he is banging a beautiful woman. $He whimpers pathetically, seeing and feeling $himself build towards an inevitable orgasm. You manage $him skillfully, taking $him to the point of climax before enjoying your own orgasm. The heat of your insides, the tightening and twitching of your <<if $PC.vagina >= 1>>vagina<<else>>rectum<</if>> around $his cock, and your obvious pleasure force $him over the edge, and $he comes so hard that $he nearly knocks your to the floor. You scoot forward, letting $him slip from you. $He gets a splendid sight of your still gaped <<if $PC.vagina >= 1>>cunt<<else>>anus<</if>> begging for more<<if $activeSlave.balls > 0>> as a blob of $his semen drips from your body<</if>>.
-=======
 				leading $him like a music teacher guiding a student's hands. When $he's groping your buttocks properly, you grind against $him for a while, grinning to yourself as you feel an unwilling erection building between your cheeks. Pleased, you lean forward and line up your <<if $PC.vagina != -1>>pussy<<else>>asshole<</if>> with $his dick head and push back into $him. You repeat until $his hips start moving on their own. You bite on your finger at the sensation of $his cock inside you and, using your other hand, begin to jerk yourself off. Except for your vigorous stroking with one hand, there's little to indicate to $him that you have a dick; it must feel as though $he is banging a beautiful woman. $He whimpers pathetically, seeing and feeling $himself build towards an inevitable orgasm. You manage $him skillfully, taking $him to the point of climax before enjoying your own orgasm. The heat of your insides, the tightening and twitching of your <<if $PC.vagina != -1>>vagina<<else>>rectum<</if>> around $his cock, and your obvious pleasure force $him over the edge, and $he comes so hard that $he nearly knocks your to the floor. You scoot forward, letting $him slip from you. $He gets a splendid sight of your still gaped <<if $PC.vagina != -1>>cunt<<else>>anus<</if>> begging for more<<if $activeSlave.balls > 0>> as a blob of $his semen drips from your body<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<br><br>
 				Over the week, you require $him to repeat this sexually confusing performance daily. It's difficult, having to savor a compliant slave's penis every day, but you make the necessary sacrifice.
 				<<if canImpreg($PC, $activeSlave)>>
@@ -13992,11 +13524,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
 			$activeSlave.slaveName finds $himself standing in front of you, feeling you roughly using two fingers to finger $his pussy. $He gasps out:
-<<<<<<< HEAD
-			"Oh <<Master>>, owner and protector, forgive my <<s>>in<<s>>, ju<<s>>t a<<s>> you forgave my <<s>>i<<s>>ter<<s>> in <<s>>lavery before me. Count not my tran<<s>>gre<<ss>>ion<<s>> again<<s>>t your rule<<s>>, but, rather, my tear<<s>> of <<s>>ervi<<c>>e. Remember not my iniquitie<<s>> but my willingne<<ss>> to be raped by you. I long to <<s>>erve your <<if $PC.dick == 0>>pu<<ss>>y<<else>><<if $PC.vagina >= 1>>futa <</if>>dick<</if>>, and beg that you will u<<s>>e me and make your dwelling pla<<c>>e within my <<if $activeSlave.vagina == 0>>virgin fold<<s>><<else>>feminine <<s>>lit<</if>>. I promi<<s>>e to <<s>>ubmit to you a<<s>> your vaginal <<s>>lut all the day<<s>> of my <<s>>ervitude."
-=======
 			"Oh <<Master>>, owner and protector, forgive my <<s>>in<<s>>, ju<<s>>t a<<s>> you forgave my <<s>>i<<s>>ter<<s>> in <<s>>lavery before me. Count not my tran<<s>>gre<<ss>>ion<<s>> again<<s>>t your rule<<s>>, but, rather, my tear<<s>> of <<s>>ervi<<c>>e. Remember not my iniquitie<<s>> but my willingne<<ss>> to be raped by you. I long to <<s>>erve your <<if $PC.dick == 0>>pu<<ss>>y<<else>><<if $PC.vagina != -1>>futa <</if>>dick<</if>>, and beg that you will u<<s>>e me and make your dwelling pla<<c>>e within my <<if $activeSlave.vagina == 0>>virgin fold<<s>><<else>>feminine <<s>>lit<</if>>. I promi<<s>>e to <<s>>ubmit to you a<<s>> your vaginal <<s>>lut all the day<<s>> of my <<s>>ervitude."
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			$He moans with relief when $he feels you withdraw your penetrating digits partway through $his recitation, but by the time $he's finished, you've shoved <<if $PC.dick == 0>>a strap-on<<else>>your dick<</if>> up $his waiting pussy. $He @@.hotpink;does $his best@@ to relax and resumes, "Oh <<Master>>..."
 			<<= VCheck.Vaginal()>>
 			<<if ($activeSlave.fetish != "humiliation") && (random(1,100) > 50)>>
@@ -14015,11 +13543,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
 			$activeSlave.slaveName finds $himself standing in front of you, feeling you roughly probe $his ass with two fingers. $He gasps out:
-<<<<<<< HEAD
-			"Oh <<Master>>, owner and protector, forgive my <<s>>in<<s>>, ju<<s>>t a<<s>> you forgave my <<s>>i<<s>>ter<<s>> in <<s>>lavery before me. Count not my tran<<s>>gre<<ss>>ion<<s>> again<<s>>t your rule<<s>>, but, rather, my tear<<s>> of anal <<s>>ervi<<c>>e. Remember not my iniquitie<<s>> but my willingne<<ss>> to be a<<ss>>raped by you. I long to <<s>>erve your <<if $PC.dick == 0>>pu<<ss>>y<<else>><<if $PC.vagina >= 1>>futa <</if>>dick<</if>>, and beg that you will u<<s>>e me and make your dwelling pla<<c>>e within my butthole. I promi<<s>>e to <<s>>ubmit to you a<<s>> your anal <<s>>lut all the day<<s>> of my <<s>>ervitude."
-=======
 			"Oh <<Master>>, owner and protector, forgive my <<s>>in<<s>>, ju<<s>>t a<<s>> you forgave my <<s>>i<<s>>ter<<s>> in <<s>>lavery before me. Count not my tran<<s>>gre<<ss>>ion<<s>> again<<s>>t your rule<<s>>, but, rather, my tear<<s>> of anal <<s>>ervi<<c>>e. Remember not my iniquitie<<s>> but my willingne<<ss>> to be a<<ss>>raped by you. I long to <<s>>erve your <<if $PC.dick == 0>>pu<<ss>>y<<else>><<if $PC.vagina != -1>>futa <</if>>dick<</if>>, and beg that you will u<<s>>e me and make your dwelling pla<<c>>e within my butthole. I promi<<s>>e to <<s>>ubmit to you a<<s>> your anal <<s>>lut all the day<<s>> of my <<s>>ervitude."
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			$He moans with relief when $he feels you withdraw your penetrating digits partway through $his recitation, but by the time $he's finished, you've shoved <<if $PC.dick == 0>>a strap-on<<else>>your dick<</if>> up $his loosened ass. $He @@.hotpink;does $his best@@ to relax and resumes, "Oh <<Master>>..."
 			<<= VCheck.Anal()>>
 			<<if ($activeSlave.fetish != "humiliation") && (random(1,100) > 50)>>
@@ -14047,11 +13571,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<else>>
 			$He begs, "Plea<<s>>e no, <<Master>>, plea<<s>>e don't rape me in my a<<ss>>, <<Master>>!"
 		<</if>>
-<<<<<<< HEAD
-		You make a show of considering, and then tell $him that if $he's extra obedient, you might let $him keep $his butt — for now. You tell $him to <<if $PC.dick >= 1>>blow you<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>lick your pussy<</if>>, and $he does with unusual obedience. When $he's done, you bend down and whisper in $his ear that if $he shows any sign of rebelliousness, you'll ruin $his little asshole. @@.gold;$He's terrified.@@
-=======
 		You make a show of considering, and then tell $him that if $he's extra obedient, you might let $him keep $his butt — for now. You tell $him to <<if $PC.dick != 0>>blow you<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>lick your pussy<</if>>, and $he does with unusual obedience. When $he's done, you bend down and whisper in $his ear that if $he shows any sign of rebelliousness, you'll ruin $his little asshole. @@.gold;$He's terrified.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.trust -= 5, $activeSlave.counter.oral++, $oralTotal++>>
 	<</replace>>
 <</link>>
@@ -14230,11 +13750,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<else>>
 			As $he lies still,
 			<<if $PC.dick == 0>>
-<<<<<<< HEAD
-				you lift one of $his legs and straddle yourself in to bring your groin against $hers. It's a strange sensation, this mass of muscle lying quietly still beneath you, whimpering with delight as you gently scissor yourself against $him. $He comes in no time at all. When $he does $he squeezes you between vicelike thighs,<<if $PC.vagina >= 1>> pressing your pussy deliciously and<</if>> bringing you to climax, too.
-=======
 				you lift one of $his legs and straddle yourself in to bring your groin against $hers. It's a strange sensation, this mass of muscle lying quietly still beneath you, whimpering with delight as you gently scissor yourself against $him. $He comes in no time at all. When $he does $he squeezes you between vicelike thighs,<<if $PC.vagina != -1>> pressing your pussy deliciously and<</if>> bringing you to climax, too.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<else>>
 				you slowly push your cock into $his
 				<<if canDoVaginal($activeSlave)>>
@@ -14279,11 +13795,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
 			It's time to see if $he's got anything left in those sore <<if $seeRace == 1>>$activeSlave.race <</if>>muscles. You order $him to take you in a standing fuck<<if $PC.belly >= 10000>>, a tall order given how pregnant you are<</if>>. Despite how exhausted $he is, $he manages to lift you and hilt $himself in your
-<<<<<<< HEAD
-			<<if $PC.vagina >= 1>>
-=======
 			<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				pussy.
 			<<else>>
 				ass.
@@ -14473,11 +13985,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			into your lap without hesitation. You help $him get comfortable and instead of <<if $PC.dick == 0>>grinding<<else>>thrusting<</if>> or telling $him to ride, you just sit there with $him in your lap,
 		<<else>>
 			onto your member
-<<<<<<< HEAD
-			<<if $PC.vagina >= 1>>
-=======
 			<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				and sliding a hand down to see to your pussy
 			<</if>>
 			without hesitation. You help $him get comfortable and instead of <<if $PC.dick == 0>>grinding<<else>>thrusting<</if>> or telling $him to ride, you just sit there with $him in your lap,
@@ -15010,19 +14518,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<</if>>
 			thighs quivering a little from supporting $his body in its perch atop the machine, and from the fullness of $his anus.
 			<<= VCheck.Anal(3)>>
-<<<<<<< HEAD
-			$He knows this is going to be challenging, and is breathing deeply, doing $his best to stay relaxed. You cannot resist slapping your <<if $PC.dick >= 1>>big cock lightly<<else>>lubricated strap-on<</if>> against $his cheek, producing a groan of apprehension.
-			<br><br>
-			You push $him gently backward, letting $him get accustomed to the new angle.<<if $activeSlave.boobs > 2000>> $His monstrous tits spread to either side of $his <<if $activeSlave.belly >= 5000>>_belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly<<else>>now upright torso<</if>>, and you take a moment to play with them as $he prepares $himself.<</if>>
-			<<if canDoVaginal($activeSlave)>>
-				$He gasps as $he feels <<if $PC.dick >= 1>>your hot dickhead<<else>>the slick head of your strap-on<</if>> part $his pussylips, no doubt feeling full already.
-				<<= VCheck.Vaginal(3)>>
-				When you're all the way in, the <<if $assistantAppearance == "monstergirl">>dildos in $his butt begin<<else>>dildo in $his butt begins<</if>> to fuck $him, harder and harder, as $assistantName moans happily. The all-encompassing feeling of fullness as $his cunt and ass are fucked to the very limit of their capacities
-			<<else>>
-				$He gasps as $he feels you push a finger up $his already-full butt and pull $his sphincter a bit wider. You withdraw it and replace it with <<if $PC.dick >= 1>>your turgid cock<<else>>your strap-on<</if>>; the slave writhes involuntarily, $his body trying to refuse the invasion of yet another phallus.
-				<<= VCheck.Anal(3)>>
-				When you're all the way in, the <<if $assistantAppearance == "monstergirl">>dildos alongside your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>> in $his butt begin<<else>>dildo alongside your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>> in $his butt begins<</if>> to fuck $him, harder and harder, as $assistantName moans happily. The all-encompassing feeling of fullness as $his ass is fucked to the very limit of its capacity
-=======
 			$He knows this is going to be challenging, and is breathing deeply, doing $his best to stay relaxed. You cannot resist slapping your <<if $PC.dick != 0>>big cock lightly<<else>>lubricated strap-on<</if>> against $his cheek, producing a groan of apprehension.
 			<br><br>
 			You push $him gently backward, letting $him get accustomed to the new angle.<<if $activeSlave.boobs > 2000>> $His monstrous tits spread to either side of $his <<if $activeSlave.belly >= 5000>>_belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly<<else>>now upright torso<</if>>, and you take a moment to play with them as $he prepares $himself.<</if>>
@@ -15034,7 +14529,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				$He gasps as $he feels you push a finger up $his already-full butt and pull $his sphincter a bit wider. You withdraw it and replace it with <<if $PC.dick != 0>>your turgid cock<<else>>your strap-on<</if>>; the slave writhes involuntarily, $his body trying to refuse the invasion of yet another phallus.
 				<<= VCheck.Anal(3)>>
 				When you're all the way in, the <<if $assistantAppearance == "monstergirl">>dildos alongside your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> in $his butt begin<<else>>dildo alongside your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> in $his butt begins<</if>> to fuck $him, harder and harder, as $assistantName moans happily. The all-encompassing feeling of fullness as $his ass is fucked to the very limit of its capacity
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<</if>>
 			quickly drives all feminine grace, presence of mind, or really, @@.hotpink;conscious thought out of the poor slave.@@ After begging for mercy for a short while, $he lapses into animal groans, drooling and leaking tears out the corner of $his eyes as you and $assistantName fuck $him into insensibility. When you climax, $assistantName ejaculates, filling the slave's anus with warm fluid.
 			<br><br>
@@ -15123,11 +14617,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<</if>>
 		<<set $activeSlave.trust += 4>>
 	<</replace>>
-<<<<<<< HEAD
-<</link>><<if (($activeSlave.anus == 0) || ($activeSlave.vagina == 0)) && ($PC.dick >= 1)>> //This option will take $his virginity//<</if>>
-=======
 <</link>><<if (($activeSlave.anus == 0) || ($activeSlave.vagina == 0)) && ($PC.dick != 0)>> //This option will take $his virginity//<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 <br><<link "Rape $him">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
@@ -15178,11 +14668,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		When you're done, you discard $him like the human sex toy $he is, and go back to your work. $He stumbles off, looking @@.gold;fearful@@ but strangely @@.hotpink;complacent,@@ as though $he's accepted this to an extent.
 		<<set $activeSlave.trust -= 4, $activeSlave.devotion += 4>>
 	<</replace>>
-<<<<<<< HEAD
-<</link>><<if (($activeSlave.anus == 0) || ($activeSlave.vagina == 0)) && ($PC.dick >= 1)>> //This option will take $his virginity//<</if>>
-=======
 <</link>><<if (($activeSlave.anus == 0) || ($activeSlave.vagina == 0)) && ($PC.dick != 0)>> //This option will take $his virginity//<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 <br><<link "Get the truth out of $him">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
@@ -15253,11 +14739,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					looking @@.mediumaquamarine;much more confident.@@
 					<<set $activeSlave.trust += 4>>
 				<</replace>>
-<<<<<<< HEAD
-			<</link>><<if (($activeSlave.anus == 0) || ($activeSlave.vagina == 0)) && ($PC.dick >= 1)>> //This option will take $his virginity//<</if>>
-=======
 			<</link>><<if (($activeSlave.anus == 0) || ($activeSlave.vagina == 0)) && ($PC.dick != 0)>> //This option will take $his virginity//<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<br><<link "Now rape $him">>
 				<<replace "#result2">>
 					You get to your feet, letting $him know that the other slaves weren't wrong. $His relief is palpable, but $he's getting ahead of
@@ -15419,21 +14901,12 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					<<setNonlocalPronouns $seeDicks>>
 					<<replace "#result2">>
 						A glance at one of your desk monitors reveals that another slave whose business brought _himU past this area of the penthouse has paused and is listening quizzically, trying to figure out what this odd, heavily accented chant coming out of your office means. It soon becomes obvious. "Fingerfuuuck!" comes $activeSlave.slaveName's voice, loud and clear, and @@.hotpink;desperately eager to please.@@ $He continues, moving from "<<S>>phincter" to
-<<<<<<< HEAD
-						<<if ($PC.dick >= 1)>>
-							"<<Master>>'<<s>><<if $PC.vagina >= 1>> futa<</if>> cock, oh no,"
-						<<else>>
-							"<<S>>trap-on, oh no,"
-						<</if>>
-						to repetition of "Anal, butt<<s>>e<<x>>, unh, a<<ss>>fucking, <<s>>odomy, um, buttfucking," and so on. Just when the eavesdropping _girlU decides that this has become monotonous and turns to go about _hisU business, $activeSlave.slaveName's voice rises sharply in pitch. "Aaah! "@@.gold;A<<ss>>rape!@@ Oh plea<<s>>e, <<Master>>, ohh, a<<ss>>rape, a<<ss>>rape," followed by much tearful repetition of what's happening to $him, and a final, sad <<if $PC.dick >= 1>>"C-creampie,"<<else>>"Gape,"<</if>> in a defeated little voice.
-=======
 						<<if ($PC.dick != 0)>>
 							"<<Master>>'<<s>><<if $PC.vagina != -1>> futa<</if>> cock, oh no,"
 						<<else>>
 							"<<S>>trap-on, oh no,"
 						<</if>>
 						to repetition of "Anal, butt<<s>>e<<x>>, unh, a<<ss>>fucking, <<s>>odomy, um, buttfucking," and so on. Just when the eavesdropping _girlU decides that this has become monotonous and turns to go about _hisU business, $activeSlave.slaveName's voice rises sharply in pitch. "Aaah! "@@.gold;A<<ss>>rape!@@ Oh plea<<s>>e, <<Master>>, ohh, a<<ss>>rape, a<<ss>>rape," followed by much tearful repetition of what's happening to $him, and a final, sad <<if $PC.dick != 0>>"C-creampie,"<<else>>"Gape,"<</if>> in a defeated little voice.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 						<<set $activeSlave.trust -= 2, $activeSlave.devotion += 4>>
 						<<= VCheck.Anal()>>
 					<</replace>>
@@ -15633,11 +15106,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					pull $him down over your knee
 				<</if>>
 			<</if>>
-<<<<<<< HEAD
-			and spank $his $activeSlave.skin buttocks until they're warm to the touch. It's not a sexual punishment, it's too painful for that; by the end, $activeSlave.slaveName has cried $himself out and is limp in your hands. You pull $him up to face you and give $him your instructions: from now on, $he can come to you and ask to <<if $PC.dick >= 1>>blow you<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>perform cunnilingus on you<</if>>, and masturbate while $he does. $He nods through $his tears and flees. In an hour or so, though, $he finds you and asks to <<if $PC.vagina >= 1>>give you oral<<else>>suck your cock<</if>>. When you pretend indifference, $he abjectly begs. Soon, $he's down on $his knees, crying a little with shame as $he masturbates furiously.
-=======
 			and spank $his $activeSlave.skin buttocks until they're warm to the touch. It's not a sexual punishment, it's too painful for that; by the end, $activeSlave.slaveName has cried $himself out and is limp in your hands. You pull $him up to face you and give $him your instructions: from now on, $he can come to you and ask to <<if $PC.dick != 0>>blow you<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>perform cunnilingus on you<</if>>, and masturbate while $he does. $He nods through $his tears and flees. In an hour or so, though, $he finds you and asks to <<if $PC.vagina != -1>>give you oral<<else>>suck your cock<</if>>. When you pretend indifference, $he abjectly begs. Soon, $he's down on $his knees, crying a little with shame as $he masturbates furiously.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<set $activeSlave.counter.oral += 5, $oralTotal += 5>>
 			<<if ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishKnown == 1)>>
 				<<set $activeSlave.fetishStrength += 4>>
@@ -16436,19 +15905,11 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<</replace>>
 	<</link>>
 <</if>>
-<<<<<<< HEAD
-<<if $PC.dick >= 1>>
-	<br><<link "Cum on $his face">>
-		<<EventNameDelink $activeSlave>>
-		<<replace "#result">>
-			You stand over $him, quietly masturbating while watching $him sleep. Several of $his fellow slaves come and go as you do so, but if they're surprised by the sight, they have the presence of mind not to show it. You fancy yourself a bit of a marks<<= _womanP>>, and you don't feel the need to bend over $him to score good hits. Your load comes in three main jets: the first hits $him on the nipple, the second tracks up $his sternum and throat, and the third splashes full across $his face as $his eyes fly open<<if $PC.vagina >= 1>>, each of these accompanied by some less directionally perfect girlcum<</if>>. $He sputters with surprise and then outrage, but <<if !canSee($activeSlave)>>once $he recognizes your <<if canTaste($activeSlave)>>taste<<else>>presence<</if>> and<<else>>then $he<</if>> realizes who it is standing over $him <<if canSee($activeSlave)>>and<<else>>does $he<</if>> @@.gold;freezes in terror.@@
-=======
 <<if $PC.dick != 0>>
 	<br><<link "Cum on $his face">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
 			You stand over $him, quietly masturbating while watching $him sleep. Several of $his fellow slaves come and go as you do so, but if they're surprised by the sight, they have the presence of mind not to show it. You fancy yourself a bit of a marks<<= _womanP>>, and you don't feel the need to bend over $him to score good hits. Your load comes in three main jets: the first hits $him on the nipple, the second tracks up $his sternum and throat, and the third splashes full across $his face as $his eyes fly open<<if $PC.vagina != -1>>, each of these accompanied by some less directionally perfect girlcum<</if>>. $He sputters with surprise and then outrage, but <<if !canSee($activeSlave)>>once $he recognizes your <<if canTaste($activeSlave)>>taste<<else>>presence<</if>> and<<else>>then $he<</if>> realizes who it is standing over $him <<if canSee($activeSlave)>>and<<else>>does $he<</if>> @@.gold;freezes in terror.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if $activeSlave.intelligence+$activeSlave.intelligenceImplant > 50>>
 				$He's quick, and $he immediately realizes
 			<<elseif $activeSlave.intelligence+$activeSlave.intelligenceImplant >= -15>>
@@ -16499,13 +15960,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<if $activeSlave.belly >= 5000>>gently lowers $himself<<else>>gets<</if>> to $his knees
 		<</if>>
 		quickly, pressing $him $activeSlave.nipples nipples against your thighs and grasping your hips to give $himself leverage for some very aggressive oral. After
-<<<<<<< HEAD
-		<<if $PC.dick >= 1>>
-			a couple of lush sucks at each of your balls<<if $PC.vagina >= 1>> and some eager nuzzling of your pussylips<</if>>, $he moves straight to a hard blowjob, deepthroating your cock and almost ramming $his head against you.<<if $PC.vagina >= 1>> $He keeps $his tongue stuck out, and whenever $he gets you fully hilted, $he manages to reach your pussylips with it.<</if>> $He <<if $activeSlave.fetish == "cumslut">>doesn't have to pretend to be starving for your cum.<<else>>does a good job of acting like $he's authentically starving for your cum.<</if>> $He groans with satisfaction when you blow your load down $his gullet,
-=======
 		<<if $PC.dick != 0>>
 			a couple of lush sucks at each of your balls<<if $PC.vagina != -1>> and some eager nuzzling of your pussylips<</if>>, $he moves straight to a hard blowjob, deepthroating your cock and almost ramming $his head against you.<<if $PC.vagina != -1>> $He keeps $his tongue stuck out, and whenever $he gets you fully hilted, $he manages to reach your pussylips with it.<</if>> $He <<if $activeSlave.fetish == "cumslut">>doesn't have to pretend to be starving for your cum.<<else>>does a good job of acting like $he's authentically starving for your cum.<</if>> $He groans with satisfaction when you blow your load down $his gullet,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<else>>
 			nuzzling $his nose against your moist cunt, $he starts to eat you out like $he's starving, sparing no time for subtlety, lapping up your female juices with evident relish. You run your fingers through $his $activeSlave.slaveName hair, telling $him $he'll have to survive on pussyjuice. $He replies, but you hold $his head hard against you as $he does, turning whatever $he says into an unintelligible, delectable mumbling into your womanhood. $He groans with satisfaction when you stiffen with orgasm, giving $him a final gush of girlcum,
 		<</if>>
@@ -16539,11 +15995,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<set $activeSlave.trust += 4, $activeSlave.counter.oral++, $oralTotal++>>
 	<</replace>>
 <</link>>
-<<<<<<< HEAD
-<<if canDoVaginal($activeSlave) && ($PC.dick >= 1)>>
-=======
 <<if canDoVaginal($activeSlave) && ($PC.dick != 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<br><<link "Feed $him">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
@@ -16582,11 +16034,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<</if>>
 			channel.
 			<<= VCheck.Vaginal()>>
-<<<<<<< HEAD
-			You're here to rut, not make love, and you give it to $him hard, forcing <<if $activeSlave.voice >= 3>>high squeals<<else>>animal grunts<</if>> out of $him. $He climaxes strongly, and the glorious feeling finishes you as well, bringing rope after rope of your cum jetting into $him. $He groans at the feeling, and as $he <<if $activeSlave.belly >= 5000 || $activeSlave.weight > 190>>slowly <</if>>gets to $his feet $he uses a hand to transfer a <<if canTaste($activeSlave)>>taste<<else>>bit<</if>> of the mixture of your seed and <<if $PC.vagina >= 1>>both of your<<else>>$his<</if>> pussyjuice to $his mouth.
-=======
 			You're here to rut, not make love, and you give it to $him hard, forcing <<if $activeSlave.voice >= 3>>high squeals<<else>>animal grunts<</if>> out of $him. $He climaxes strongly, and the glorious feeling finishes you as well, bringing rope after rope of your cum jetting into $him. $He groans at the feeling, and as $he <<if $activeSlave.belly >= 5000 || $activeSlave.weight > 190>>slowly <</if>>gets to $his feet $he uses a hand to transfer a <<if canTaste($activeSlave)>>taste<<else>>bit<</if>> of the mixture of your seed and <<if $PC.vagina != -1>>both of your<<else>>$his<</if>> pussyjuice to $his mouth.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if $activeSlave.belly >= 750000>>
 				"Oh <<Master>>! I'm <<s>>welling <<s>>o fast with imp<<s>> for you! There'<<s>> <<s>>o many in me... Oh god, it feel<<s>> like I'm going to bur<<s>>t! <<S>>o many... <<Master>> <<s>>ure i<<s>> potent! I hope <<heP>> can handle them all!" $He groans, cradling $his _belly belly and pretending to be forced to the ground by $his pregnancy growing ever larger. "<<Master>>! They won't <<s>>top! Oh... <<S>>o full... I can't <<s>>top con<<c>>eiving!" $He rolls onto $his back and clutches $his absurd stomach. "<<S>>o tight! <<S>>o full! <<S>>o Good! I need more! Oh, <<Master>>..." $He may be getting a little too into the fantasy.
 				<<if $activeSlave.broodmother == 2 && $activeSlave.preg > 37>>
@@ -16622,11 +16070,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<</replace>>
 	<</link>><<if $activeSlave.vagina == 0>> //This option will take $his virginity//<</if>>
 <</if>>
-<<<<<<< HEAD
-<<if canDoAnal($activeSlave) && ($activeSlave.anus > 0) && ($PC.dick >= 1)>>
-=======
 <<if canDoAnal($activeSlave) && ($activeSlave.anus > 0) && ($PC.dick != 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<br><<link "Fuck $him without feeding $him">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
@@ -17364,31 +16808,18 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<</if>>
 		<br><br>
 		You swing a bucket under $his nipples and milk $him by hand, as though $he were a cow. This isn't exactly what $he had in mind, but the feeling of your hands on $his nipples, tugging the streams of milk out of $him and into the bucket beneath <<if $activeSlave.fetish == "boobs">>brings $him very close to orgasm<<else>>eventually relaxes $him<</if>>. Seeing this, you muse aloud, as though to yourself, that a little farmyard bestiality wouldn't hurt, since there's no one here but you and a dairy cow. Pawing the cow's behind possessively, you finger $him aggressively before deciding on
-<<<<<<< HEAD
-		<<if canDoVaginal($activeSlave) && $PC.dick >= 1>>
-			a little cow pussy. You walk around behind $him and fuck $him hard enough to shake the drops of milk still clinging to $his sore nipples down and into the bucket below.
-			<<= VCheck.Vaginal()>>
-			When you're finished, you step away, leaving your cum to run out of $his cunt and down $his thighs,
-		<<elseif canDoAnal($activeSlave) && $PC.dick >= 1>>
-=======
 		<<if canDoVaginal($activeSlave) && $PC.dick != 0>>
 			a little cow pussy. You walk around behind $him and fuck $him hard enough to shake the drops of milk still clinging to $his sore nipples down and into the bucket below.
 			<<= VCheck.Vaginal()>>
 			When you're finished, you step away, leaving your cum to run out of $his cunt and down $his thighs,
 		<<elseif canDoAnal($activeSlave) && $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			some cow ass. You walk around behind $him and buttfuck $his hard enough to shake the drops of milk still clinging to $his sore nipples down and into the bucket below.
 			<<= VCheck.Anal()>>
 			When you're finished, you step away, leaving your cum to drip out of $his gaped asshole,
 		<<else>>
 			a little cow tongue action.
-<<<<<<< HEAD
-			<<if $PC.vagina >= 1>>
-				You stand up and grind your pussy against the cow's upturned mouth, humping $his face hard enough to shake the drops of milk still clinging to $his sore nipples down and into the bucket below.<<if $PC.dick >= 1>> You pull away when you're about halfway there, only to shove your cock down $his throat instead.<</if>> When you're finished, you step away, leaving $his face thoroughly coated in girlcum<<if $PC.dick >= 1>> and $his mouth full of your load<</if>>,
-=======
 			<<if $PC.vagina != -1>>
 				You stand up and grind your pussy against the cow's upturned mouth, humping $his face hard enough to shake the drops of milk still clinging to $his sore nipples down and into the bucket below.<<if $PC.dick != 0>> You pull away when you're about halfway there, only to shove your cock down $his throat instead.<</if>> When you're finished, you step away, leaving $his face thoroughly coated in girlcum<<if $PC.dick != 0>> and $his mouth full of your load<</if>>,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<else>>
 			<</if>>
 			<<set $activeSlave.counter.oral++, $oralTotal++>>
@@ -17399,11 +16830,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<set $activeSlave.lactationDuration = 2>>
 		<<set $activeSlave.boobs -= $activeSlave.boobsMilk, $activeSlave.boobsMilk = 0>>
 	<</replace>>
-<<<<<<< HEAD
-<</link>><<if $PC.dick >= 1>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>>//This option will take $his virginity//<<elseif !canDoVaginal($activeSlave) && canDoAnal($activeSlave) && ($activeSlave.anus == 0)>> //This option will take $his anal virginity//<</if>><</if>>
-=======
 <</link>><<if $PC.dick != 0>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>>//This option will take $his virginity//<<elseif !canDoVaginal($activeSlave) && canDoAnal($activeSlave) && ($activeSlave.anus == 0)>> //This option will take $his anal virginity//<</if>><</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 
 <<case "refreshment delivery">>
 
@@ -17426,11 +16853,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<elseif $PC.refreshmentType == 6>>
 			tabs of $PC.refreshment
 		<</if>>
-<<<<<<< HEAD
-		and <<if $PC.dick >= 1>>a blowjob<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>some cunnilingus<</if>>. Turning to $activeSlave.slaveName, you
-=======
 		and <<if $PC.dick != 0>>a blowjob<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>some cunnilingus<</if>>. Turning to $activeSlave.slaveName, you
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<if $PC.refreshmentType == 0>>
 			select a $PC.refreshment,
 		<<elseif $PC.refreshmentType == 1>>
@@ -17534,21 +16957,12 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<</if>>
 				You go back to work, letting the slave loll around on your desk, enjoying the effects. You reflect that it's probably some kind of milestone in wealth that you're willing to throw the good stuff around like this. When $he's had time to reflect on the strange incident, $he @@.mediumaquamarine;resolves to trust you more in the future,@@ since it can be fun.
 			<<else>>
-<<<<<<< HEAD
-				You tell $him to hop up on the desk and face you. $He obeys promptly, <<if $activeSlave.energy > 95>>already starting to pant<<else>><<if canSee($activeSlave)>>watching you closely<<elseif canHear($activeSlave)>>listening closely<<else>>waiting<</if>> for further instructions<</if>>. To $his surprise, you <<if $PC.boobs >= 1>>unfasten your top, freeing your breasts, and <</if>>uncover your <<if $PC.dick >= 1>>stiffening cock<<if $PC.vagina >= 1>> and moistening pussy<</if>><<else>>moistening pussy<</if>>. Taking some $PC.refreshment in your fingers, you massage it onto your erect
-				<<if $PC.dick >= 1 && $PC.boobs >= 1>>
-					nipples and dick
-				<<elseif $PC.vagina >= 1 && $PC.boobs >= 1>>
-					nipples and clit
-				<<elseif $PC.dick >= 1>>
-=======
 				You tell $him to hop up on the desk and face you. $He obeys promptly, <<if $activeSlave.energy > 95>>already starting to pant<<else>><<if canSee($activeSlave)>>watching you closely<<elseif canHear($activeSlave)>>listening closely<<else>>waiting<</if>> for further instructions<</if>>. To $his surprise, you <<if $PC.boobs >= 300>>unfasten your top, freeing your breasts, and <</if>>uncover your <<if $PC.dick != 0>>stiffening cock<<if $PC.vagina != -1>> and moistening pussy<</if>><<else>>moistening pussy<</if>>. Taking some $PC.refreshment in your fingers, you massage it onto your erect
 				<<if $PC.dick != 0 && $PC.boobs >= 300>>
 					nipples and dick
 				<<elseif $PC.vagina != -1 && $PC.boobs >= 300>>
 					nipples and clit
 				<<elseif $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					dick
 				<<else>>
 					clit
@@ -17828,11 +17242,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <br><<link "Double penetrate $his ass for insolence">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-		You step forward and take gentle hold of the slave's throat, telling $him to get down on $his knees like a good little $desc. You make no threat, but give $him the order in a voice of brass. $He knows what you can do to $him, and hurries to obey, @@.gold;terribly frightened.@@ $His fear is justified. You announce that $he's avoided serious punishment, but $he still needs correction for $his hesitation and insolence. $He's concerned when $he <<if canSee($activeSlave)>>sees<<elseif canHear($activeSlave)>>hears<<else>>feels<</if>> you <<if $PC.dick >= 1>>get your dick<<if $PC.vagina >= 1>>and pussy<</if>> out<<else>>don a strap-on<</if>>, though $he's distracted by the rapidly accelerating buttfuck $he's getting from the machine. $He tries to offer you $his throat, but $his hopes are dashed when you walk around behind $him, swing a leg over the machine pistoning in and out of $his asshole, and command it to stop for a moment. Then you work <<if $PC.dick >= 1>>yourself<<else>>your own dildo<</if>> up $his ass alongside the phallus that already fills it. The drugs are delivered with lubricant, and you do fit, but only after a nice long session of sobbing, spasming, and finally crying resignation. Then you order the machine to go back to what it was doing, and the resignation vanishes, replaced with anal pain as $activeSlave.slaveName takes double penetration up $his <<if $activeSlave.anus > 2>>gaping anus<<elseif $activeSlave.anus == 2>>big butthole<<else>>poor, abused little butt<</if>>.
-=======
 		You step forward and take gentle hold of the slave's throat, telling $him to get down on $his knees like a good little $desc. You make no threat, but give $him the order in a voice of brass. $He knows what you can do to $him, and hurries to obey, @@.gold;terribly frightened.@@ $His fear is justified. You announce that $he's avoided serious punishment, but $he still needs correction for $his hesitation and insolence. $He's concerned when $he <<if canSee($activeSlave)>>sees<<elseif canHear($activeSlave)>>hears<<else>>feels<</if>> you <<if $PC.dick != 0>>get your dick<<if $PC.vagina != -1>>and pussy<</if>> out<<else>>don a strap-on<</if>>, though $he's distracted by the rapidly accelerating buttfuck $he's getting from the machine. $He tries to offer you $his throat, but $his hopes are dashed when you walk around behind $him, swing a leg over the machine pistoning in and out of $his asshole, and command it to stop for a moment. Then you work <<if $PC.dick != 0>>yourself<<else>>your own dildo<</if>> up $his ass alongside the phallus that already fills it. The drugs are delivered with lubricant, and you do fit, but only after a nice long session of sobbing, spasming, and finally crying resignation. Then you order the machine to go back to what it was doing, and the resignation vanishes, replaced with anal pain as $activeSlave.slaveName takes double penetration up $his <<if $activeSlave.anus > 2>>gaping anus<<elseif $activeSlave.anus == 2>>big butthole<<else>>poor, abused little butt<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<if ($suppository != 0) && ($activeSlave.drugs != "none")>>When you grow tired of the whining, you order the kitchen to give the bitch breakfast. It extends a feeding phallus and fills $his throat, muffling the noise somewhat.<</if>>
 		<<set $activeSlave.trust -= 4>>
 		<<= VCheck.Anal()>>
@@ -17970,11 +17380,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<else>>
 				soft
 			<</if>>
-<<<<<<< HEAD
-			thighs, producing a shiver from the $desc, and lift $him up against your chest, pinning $him there with your hands supporting the backs of $his knees. Giggling<<if $activeSlave.voice == 0>> mutely<</if>>, $he finds $himself held in a fetal position with $his back pressed against your <<if $PC.boobs >= 1>>tits<<else>>chest<</if>>.
-=======
 			thighs, producing a shiver from the $desc, and lift $him up against your chest, pinning $him there with your hands supporting the backs of $his knees. Giggling<<if $activeSlave.voice == 0>> mutely<</if>>, $he finds $himself held in a fetal position with $his back pressed against your <<if $PC.boobs >= 300>>tits<<else>>chest<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if $activeSlave.boobs > 40000>>
 				$His expansive tits not only weigh $him down, but also force you to push $him against the shower wall for added support.
 			<<elseif $activeSlave.weight > 160>>
@@ -18039,13 +17445,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				You can hold the little slave like this as long as you like.
 			<</if>>
 			You shift your grip to hold $him with one hand so you can
-<<<<<<< HEAD
-			<<if $PC.dick >= 1>>
-				maneuver your cock inside $him, and then resume your original hold so you can slide $him up and down your shaft. <<if $PC.vagina >= 1>>You make sure $he's really hilted at the height of each stroke, putting some nice pressure on your pussy.<</if>>
-=======
 			<<if $PC.dick != 0>>
 				maneuver your cock inside $him, and then resume your original hold so you can slide $him up and down your shaft. <<if $PC.vagina != -1>>You make sure $he's really hilted at the height of each stroke, putting some nice pressure on your pussy.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<else>>
 				slide your fingers inside $his <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>>, since you're not putting $him down to get a strap-on. Knowing $he can't reach your cunt to return the favor like this, $he relaxes and lets you play with $him.
 			<</if>>
@@ -18211,17 +17612,10 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
 			You decide to have some fun with the temporarily helpless slave. You
-<<<<<<< HEAD
-			<<if $activeSlave.ID == $Bodyguard.ID>>get out of bed<<else>>head to where $he's waiting for help<</if>> and scoop $him up, $his limblessness making it comically easy. With $his torso cradled in your grasp and $his head nestled into the crook of your arm, you carry $his <<if $activeSlave.ID == $Bodyguard.ID>>back towards your bed<<else>>back towards your suite<</if>>. When $he <<if canSee($activeSlave)>>sees<<else>>figures out<</if>> what you're doing, $he turns $his head and gives your <<if $PC.boobs >= 1>>breast on that side<<else>>chest<</if>> an anticipatory kiss. When you set $him down on the bed, $he <<if canSee($activeSlave)>>stares<<else>>smiles<</if>> up at you invitingly and gives $his four P-Limb anchor points a glinting wiggle, a gesture that might mean anything. $His <<if canDoVaginal($activeSlave)>>pussy<<else>>asshole<</if>>, in any case, is presented openly for your use.
-			<br><br>
-			After fingering your helpless toy experimentally, you
-			<<if $PC.dick >= 1>>
-=======
 			<<if $activeSlave.ID == $Bodyguard.ID>>get out of bed<<else>>head to where $he's waiting for help<</if>> and scoop $him up, $his limblessness making it comically easy. With $his torso cradled in your grasp and $his head nestled into the crook of your arm, you carry $his <<if $activeSlave.ID == $Bodyguard.ID>>back towards your bed<<else>>back towards your suite<</if>>. When $he <<if canSee($activeSlave)>>sees<<else>>figures out<</if>> what you're doing, $he turns $his head and gives your <<if $PC.boobs >= 300>>breast on that side<<else>>chest<</if>> an anticipatory kiss. When you set $him down on the bed, $he <<if canSee($activeSlave)>>stares<<else>>smiles<</if>> up at you invitingly and gives $his four P-Limb anchor points a glinting wiggle, a gesture that might mean anything. $His <<if canDoVaginal($activeSlave)>>pussy<<else>>asshole<</if>>, in any case, is presented openly for your use.
 			<br><br>
 			After fingering your helpless toy experimentally, you
 			<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<if canDoVaginal($activeSlave)>>
 					slide yourself inside $him and start fucking $him.
 					<<= VCheck.Vaginal()>>
@@ -18234,11 +17628,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<<set $activeSlave.counter.oral++, $oralTotal++>>
 			<</if>>
 			$He has no control at all, but $he trusts you not to hurt $him and is soon enjoying $himself. $He can't seem to stop $himself from trying to move P-Limbs that aren't there, forgetting that $he's not wearing them whenever the arousal builds high enough to make $him forgetful. Eventually $he stops trying to restrain $himself, realizing that you're enjoying $his delicious wriggling beneath you. $He orgasms hard,
-<<<<<<< HEAD
-			<<if $PC.dick >= 1>>
-=======
 			<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<if canDoVaginal($activeSlave)>>the walls of $his pussy squeezing your shaft<<else>>$his anus tightening around the base of your dick<</if>>.
 			<<else>>
 				moaning $his climax into your pussy with abandon.
@@ -18247,11 +17637,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			When you've climaxed yourself, $he looks back towards where $his P-Limbs are waiting, but you're not done with $his yet. You pick $him up again and bring $him into the shower. $He tries to help you, but again, $he gives up after a while, letting you wash $him. As you're rinsing the soap off $him, $he @@.hotpink;thanks you devotedly.@@ With the water streaming down $his face, you barely notice $his gentle tears.
 			<<set $activeSlave.devotion += 4>>
 		<</replace>>
-<<<<<<< HEAD
-	<</link>><<if ((($activeSlave.vagina == 0) && canDoVaginal($activeSlave)) || (($activeSlave.anus == 0) && canDoAnal($activeSlave))) && $PC.dick >= 1>> //This option will take $his virginity//<</if>>
-=======
 	<</link>><<if ((($activeSlave.vagina == 0) && canDoVaginal($activeSlave)) || (($activeSlave.anus == 0) && canDoAnal($activeSlave))) && $PC.dick != 0>> //This option will take $his virginity//<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 <</if>>
 
 <<case "orchiectomy please">>
@@ -18490,19 +17876,11 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				<<if canAchieveErection($activeSlave) && ($activeSlave.chastityPenis == 1)>>There's an audible little smack as $he achieves an erection, bringing $his dickhead against the bottom of the counter.<</if>>
 			<</if>>
 		<<elseif $activeSlave.devotion > 50>>
-<<<<<<< HEAD
-			$He softens into your <<if $PC.boobs >= 1>>bosom<<else>>chest<</if>>, wriggling $his back into you to get comfortable.
-		<<elseif $activeSlave.devotion > 20>>
-			$He makes an effort to relax, and you can feel the stiffness go out of $his back, pressed against your <<if $PC.boobs >= 1>>bosom<<else>>chest<</if>>.
-		<<else>>
-			$He remains stiff and afraid, shivering a little against your <<if $PC.boobs >= 1>>bosom<<else>>chest<</if>>.
-=======
 			$He softens into your <<if $PC.boobs >= 300>>bosom<<else>>chest<</if>>, wriggling $his back into you to get comfortable.
 		<<elseif $activeSlave.devotion > 20>>
 			$He makes an effort to relax, and you can feel the stiffness go out of $his back, pressed against your <<if $PC.boobs >= 300>>bosom<<else>>chest<</if>>.
 		<<else>>
 			$He remains stiff and afraid, shivering a little against your <<if $PC.boobs >= 300>>bosom<<else>>chest<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<</if>>
 		$He expects to get fucked, but you just massage $his breasts thoroughly, give $his <<if $activeSlave.pregKnown == 1>>belly<<else>>butt<</if>> a possessive pat, and continue on your way. $He thanks you <<if $activeSlave.devotion > 50>>with touching sincerity<<elseif $activeSlave.devotion > 20>>sincerely<<else>>hesitantly<</if>> and returns to $his business, @@.mediumaquamarine;smiling a little.@@
 		<<set $activeSlave.trust += 4>>
@@ -18537,11 +17915,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				and $he starts to cry, more from fear than from the pain.
 			<</if>>
 			<br><br>
-<<<<<<< HEAD
-			Pleased, you tell $him to keep it up as best $he can, and trap $his hips against the edge of the counter before sliding <<if $PC.dick >= 1>>your cock<<else>>a strap-on<</if>> <<if canDoVaginal($activeSlave)>>into $his pussy<<else>>up $his asshole<</if>>. It's not a comfortable angle, and between the rough penetration and the continued mammary torture,<<if $activeSlave.fetish == "masochist">>$he orgasms promptly<<if $activeSlave.balls > 0>>, scattering cum all over the counter<</if>><<else>>tears begin to run down $his cheeks<</if>>. When you climax, you grab the undersides of $his breasts and hoist $him up in a parody of exaltation, thrusting as far into $him as you can manage<<if $PC.dick >= 1>> and <<if canDoVaginal($activeSlave)>>coming inside $him<<else>>blowing your load in $his butt<</if>><</if>>. The thrust, the lift, and the harsh hold on $his poor boobs extracts <<if $activeSlave.voice != 0>>a shriek<<else>>the pathetic little gasping noise that mute slaves make when in agony<</if>> from $his<<if $activeSlave.lactation > 0>>, not to mention <<if $activeSlave.lactation == 1>>a few drops of milk<<else>>an ejaculation-like stream of milk<</if>> from each of $his nipples<</if>>. You discard your toy on the counter,
-=======
 			Pleased, you tell $him to keep it up as best $he can, and trap $his hips against the edge of the counter before sliding <<if $PC.dick != 0>>your cock<<else>>a strap-on<</if>> <<if canDoVaginal($activeSlave)>>into $his pussy<<else>>up $his asshole<</if>>. It's not a comfortable angle, and between the rough penetration and the continued mammary torture,<<if $activeSlave.fetish == "masochist">>$he orgasms promptly<<if $activeSlave.balls > 0>>, scattering cum all over the counter<</if>><<else>>tears begin to run down $his cheeks<</if>>. When you climax, you grab the undersides of $his breasts and hoist $him up in a parody of exaltation, thrusting as far into $him as you can manage<<if $PC.dick != 0>> and <<if canDoVaginal($activeSlave)>>coming inside $him<<else>>blowing your load in $his butt<</if>><</if>>. The thrust, the lift, and the harsh hold on $his poor boobs extracts <<if $activeSlave.voice != 0>>a shriek<<else>>the pathetic little gasping noise that mute slaves make when in agony<</if>> from $his<<if $activeSlave.lactation > 0>>, not to mention <<if $activeSlave.lactation == 1>>a few drops of milk<<else>>an ejaculation-like stream of milk<</if>> from each of $his nipples<</if>>. You discard your toy on the counter,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if $activeSlave.fetish == "masochist">>
 				leaving the poor pain addict in a state of @@.hotpink;high sexual satiation,@@ even if $he does move $his battered breasts gingerly as $he climbs down.
 				<<set $activeSlave.devotion += 4>>
@@ -18773,11 +18147,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<<link "Fuck $him">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
-<<<<<<< HEAD
-			You announce that you're going to fuck $his <<if $activeSlave.anus == 0>>virgin <</if>>asspussy. To your complete lack of surprise, $he can't hide $his horror at the prospect of <<if $PC.dick >= 1>>having a cock inside $his<<else>>being fucked with a strap-on<</if>>, and $his <<if canSee($activeSlave)>>wide, <<= App.Desc.eyeColor($activeSlave)>> eyes track<<else>>terrified face follows<</if>> your movements closely as you stand up and <<if $PC.dick >= 1>>reveal the formidable member<<else>>don the strap-on<</if>> you're about to breed $him with. You order $him to kneel on the couch, which $he does, @@.gold;cringing in fear of being buttfucked, but knowing disobedience will be worse;@@ and then you order $him to reach down and spread $his butt for you, as wide as it'll go. $He complies,
-=======
 			You announce that you're going to fuck $his <<if $activeSlave.anus == 0>>virgin <</if>>asspussy. To your complete lack of surprise, $he can't hide $his horror at the prospect of <<if $PC.dick != 0>>having a cock inside $his<<else>>being fucked with a strap-on<</if>>, and $his <<if canSee($activeSlave)>>wide, <<= App.Desc.eyesColor($activeSlave)>> track<<else>>terrified face follows<</if>> your movements closely as you stand up and <<if $PC.dick != 0>>reveal the formidable member<<else>>don the strap-on<</if>> you're about to breed $him with. You order $him to <<if hasAnyLegs($activeSlave)>>kneel<<else>>get<</if>> on the couch, which $he does, @@.gold;cringing in fear of being buttfucked, but knowing disobedience will be worse;@@ and then you order $him to reach down and spread $his butt for you, as wide as it'll go. $He complies,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if $activeSlave.butt > 12>>
 				grabbing as much flesh as $he can of each monstrous buttock and heaving them as far apart as $he can manage in an attempt
 			<<elseif $activeSlave.butt > 6>>
@@ -18795,11 +18165,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<else>>
 				tight little rosebud.
 			<</if>>
-<<<<<<< HEAD
-			You let $him soak in $his discomfort, <<if $PC.dick >= 1>>stroking your cock gently<<else>>rubbing a little lube on the tip of your phallus<</if>> and letting $him see how big it is. $His cringing even extends to $his asshole,
-=======
 			You let $him soak in $his discomfort, <<if $PC.dick != 0>>stroking your cock gently<<else>>rubbing a little lube on the tip of your phallus<</if>> and letting $him see how big it is. $His cringing even extends to $his asshole,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if $activeSlave.analArea > 3>>
 				the huge area of crinkled skin
 			<<elseif $activeSlave.analArea > 1>>
@@ -18812,11 +18178,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<br><br><span id="result2">
 				<<link "Make sure $he gets off on it">>
 					<<replace "#result2">>
-<<<<<<< HEAD
-						You press <<if $PC.dick >= 1>>yourself<<else>>your weapon<</if>> past $his sphincter with care, and $his posture softens a little as $he realizes you aren't going to hurt $him. Once you've hilted <<if $PC.dick >= 1>>your cock<<else>>the strap-on<</if>> inside $him, you caress $his
-=======
 						You press <<if $PC.dick != 0>>yourself<<else>>your weapon<</if>> past $his sphincter with care, and $his posture softens a little as $he realizes you aren't going to hurt $him. Once you've hilted <<if $PC.dick != 0>>your cock<<else>>the strap-on<</if>> inside $him, you caress $his
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 						<<if $activeSlave.belly >= 150000>>
 							_belly distended
 						<<elseif $activeSlave.weight > 95>>
@@ -18844,11 +18206,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 						<<else>>
 							thin
 						<</if>>
-<<<<<<< HEAD
-						waist, running your hands across $his skin. Then you <<if $activeSlave.clitPiercing == 3>>activate $his smart frenulum piercing<<else>>secure a couple of little egg vibes to $his dick<</if>>. $He gasps as the vibration starts, and then gasps again as $his anus tightens involuntarily with the stimulation, squeezing the <<if $PC.dick >= 1>>warm penis<<else>>phallus<</if>> that fills it. $He <<if $activeSlave.voice > 0>>moans openly<<else>>rasps mutely<</if>> as you pull out and then thrust into $him. Much against $his will, $he <<if canAchieveErection($activeSlave)>>quickly becomes erect<<else>>starts to drip precum, which is $his ballsless body's way of showing arousal<</if>>.
-=======
 						waist, running your hands across $his skin. Then you <<if $activeSlave.clitPiercing == 3>>activate $his smart frenulum piercing<<else>>secure a couple of little egg vibes to $his dick<</if>>. $He gasps as the vibration starts, and then gasps again as $his anus tightens involuntarily with the stimulation, squeezing the <<if $PC.dick != 0>>warm penis<<else>>phallus<</if>> that fills it. $He <<if $activeSlave.voice > 0>>moans openly<<else>>rasps mutely<</if>> as you pull out and then thrust into $him. Much against $his will, $he <<if canAchieveErection($activeSlave)>>quickly becomes erect<<else>>starts to drip precum, which is $his ballsless body's way of showing arousal<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 						<<if $activeSlave.fetish == "buttslut">>
 						<<if $activeSlave.fetishKnown == 1>>
 							<<if $activeSlave.fetishStrength > 95>>
@@ -18894,11 +18252,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<br><br><span id="result2">
 			<<link "Make $him perform oral on you, right here">>
 				<<replace "#result2">>
-<<<<<<< HEAD
-					You reach around, place a dominating hand on $his shoulder, pull $him around in front of you, and push $him down to $his knees. $He quickly realizes what's coming, and $his $activeSlave.skin cheeks blush furiously as you reveal your <<if $PC.dick >= 1>>meaty dick<<else>>flushed pussy<</if>> and offer it to $him. $He gets busy, burying $his head against you with a speed that seems surprising until it occurs to you that this allows $him to hide $his face. Deciding to accept this tiny compromise, you run a possessive hand <<if $activeSlave.hLength < 5>>across $his smooth scalp<<elseif $activeSlave.hLength < 20>>through $his short hair<<else>>through $his tresses<</if>> and murmur praise for $his enthusiasm. $He stiffens at the implication that $he wants to be <<if $PC.dick >= 1>>polishing your penis<<else>>eating you out<</if>> in broad daylight, but after a slight pause $he decides that this isn't bad. As <<if $PC.dick >= 1>>$his head continues to bob back and forth as $he sucks your dick<<else>>$he continues nuzzling $his nose and mouth against your wet cunt<</if>>, $he fails to notice $his @@.hotpink;second major submission today.@@
-=======
 					You reach around, place a dominating hand on $his shoulder, pull $him around in front of you, and push $him down to $his knees. $He quickly realizes what's coming, and $his $activeSlave.skin cheeks blush furiously as you reveal your <<if $PC.dick != 0>>meaty dick<<else>>flushed pussy<</if>> and offer it to $him. $He gets busy, burying $his head against you with a speed that seems surprising until it occurs to you that this allows $him to hide $his face. Deciding to accept this tiny compromise, you run a possessive hand <<if $activeSlave.hLength < 5>>across $his smooth scalp<<elseif $activeSlave.hLength < 20>>through $his short hair<<else>>through $his tresses<</if>> and murmur praise for $his enthusiasm. $He stiffens at the implication that $he wants to be <<if $PC.dick != 0>>polishing your penis<<else>>eating you out<</if>> in broad daylight, but after a slight pause $he decides that this isn't bad. As <<if $PC.dick != 0>>$his head continues to bob back and forth as $he sucks your dick<<else>>$he continues nuzzling $his nose and mouth against your wet cunt<</if>>, $he fails to notice $his @@.hotpink;second major submission today.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					<<if $activeSlave.fetish == "humiliation">>
 						<<if $activeSlave.fetishKnown == 1>>
 							Since $he has a humiliation fetish, the embarrassment has been arousing $him even as it's been torturing $him. Unsatisfied with just this, $his need to be shamed obliges $him to cock $his hips and make sure onlookers can see $his asspussy as $he services you with $his mouth.
@@ -18996,11 +18350,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			closer than ever.
 		<</if>>
 		You take your other hand and place a firm but loving grip under $his chin, lifting $his <<= App.Desc.eyeColor($activeSlave)>>-eyed gaze to meet yours before kissing $him again. All the while, you
-<<<<<<< HEAD
-		<<if $PC.dick >= 1>>
-=======
 		<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			fuck $him powerfully, withdrawing your dick almost all the way and then hilting yourself in $his soaked slit.
 			<<= VCheck.Vaginal()>>
 		<<else>>
@@ -19227,11 +18577,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<</replace>>
 	<</link>> //This option will cost <<print cashFormat($surgeryCost)>>//
 <</if>>
-<<<<<<< HEAD
-<<if canGetPregnant($activeSlave) && $PC.dick >= 1>>
-=======
 <<if canGetPregnant($activeSlave) && $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<link "Give $his bust a boost by knocking $him up">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
@@ -19279,22 +18625,14 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		Pulling $him back against your
 		<<if $PC.belly > 1500>>
 			pregnant belly,
-<<<<<<< HEAD
-		<<elseif $PC.boobs >= 1>>
-=======
 		<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			own bosom,
 		<<elseif $PC.title == 0>>
 			flat chest,
 		<<else>>
 			muscular chest,
 		<</if>>
-<<<<<<< HEAD
-		you reach around $him and take over the breast-cradling responsibilities. You say nothing for a while, just hefting $his weighty udders, rolling them from side to side slightly. After letting $him get used to the gentle treatment, you tell $him that you're $his owner, and you find big breasts very attractive. You tell $him that you understand that they can be uncomfortable at times, but you expect $him to tolerate that without complaint. It isn't easy to be pretty, but it's easier to be a pretty slave than to be a homely one. This last point affects $him, and $he seems to @@.mediumaquamarine;take heart in the idea that you're improving $him,@@ at least from your perspective. After all, $he's sitting atop <<if $PC.dick >= 1>>your hard dick, which $he can definitely feel<<else>>your hot cunt, which $he can probably detect<</if>> through your clothes. $He does understand that having $his <<= WrittenMaster($activeSlave)>> enjoy touching $his boobs will be advantageous to $him.
-=======
 		you reach around $him and take over the breast-cradling responsibilities. You say nothing for a while, just hefting $his weighty udders, rolling them from side to side slightly. After letting $him get used to the gentle treatment, you tell $him that you're $his owner, and you find big breasts very attractive. You tell $him that you understand that they can be uncomfortable at times, but you expect $him to tolerate that without complaint. It isn't easy to be pretty, but it's easier to be a pretty slave than to be a homely one. This last point affects $him, and $he seems to @@.mediumaquamarine;take heart in the idea that you're improving $him,@@ at least from your perspective. After all, $he's sitting atop <<if $PC.dick != 0>>your hard dick, which $he can definitely feel<<else>>your hot cunt, which $he can probably detect<</if>> through your clothes. $He does understand that having $his <<= WrittenMaster($activeSlave)>> enjoy touching $his boobs will be advantageous to $him.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.trust += 5>>
 		<<if $activeSlave.lactation > 0>>
 			<<set $activeSlave.lactationDuration = 2>>
@@ -19351,11 +18689,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<span id="result2">
 			<<link "Break $him in again">>
 				<<replace "#result2">>
-<<<<<<< HEAD
-					$His ass is yours all over again. As soon as $his newly tight rosebud has recovered enough, you visit $him in the surgery, without even waiting for $him to leave it. You flip $him over on the recovery bed and force <<if $PC.dick >= 1>>your cock<<else>>a strap-on<</if>> up $his butt while $he wriggles with eager discomfort, squealing in pretended horror. $His renewed anal virginity was very brief; $his ass is once again @@.lime;broken in for penetration.@@ For $his part, $he @@.hotpink;thoroughly enjoyed losing $his anal cherry,@@ again.
-=======
 					$His ass is yours all over again. As soon as $his newly tight rosebud has recovered enough, you visit $him in the surgery, without even waiting for $him to leave it. You flip $him over on the recovery bed and force <<if $PC.dick != 0>>your cock<<else>>a strap-on<</if>> up $his butt while $he wriggles with eager discomfort, squealing in pretended horror. $His renewed anal virginity was very brief; $his ass is once again @@.lime;broken in for penetration.@@ For $his part, $he @@.hotpink;thoroughly enjoyed losing $his anal cherry,@@ again.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					<<set $activeSlave.devotion += 5, $activeSlave.counter.anal++, $analTotal++, $activeSlave.anus = 1>>
 					<<= knockMeUp($activeSlave, 5, 1, -1, 1)>>
 				<</replace>>
@@ -19699,15 +19033,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 		You rise from behind your desk, and $activeSlave.slaveName collapses to the floor, sure that $he's about to be severely punished. $He's shocked to feel your arms encircle $him as you kneel down beside $him and embrace $his huddled form. You pull $his head
-<<<<<<< HEAD
-		<<if $PC.boobsBonus > 2>>
-			against your enormous, <<if $PC.boobsImplant == 1>>hard<<else>>soft<</if>> breasts,
-		<<elseif $PC.boobsBonus == 2>>
-			against your huge <<if $PC.boobsImplant == 1>>firm<<else>>soft<</if>> breasts,
-		<<elseif $PC.boobsBonus == 1>>
-			against your big <<if $PC.boobsImplant == 1>>firm<<else>>soft<</if>> breasts,
-		<<elseif $PC.boobs >= 1>>
-=======
 		<<if $PC.boobs >= 1400>>
 			against your enormous, <<if $PC.boobsImplant != 0>>hard<<else>>soft<</if>> breasts,
 		<<elseif $PC.boobs >= 1200>>
@@ -19715,7 +19040,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<elseif $PC.boobs >= 1000>>
 			against your big <<if $PC.boobsImplant != 0>>firm<<else>>soft<</if>> breasts,
 		<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			against your soft breasts,
 		<<elseif $PC.title == 0>>
 			against your flat chest,
@@ -19974,11 +19298,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<else>>
 			uses $his arms for balance, since $his cute butt can stay out of the way on its own and doesn't need to be spread by hand.
 		<</if>>
-<<<<<<< HEAD
-		<<if $activeSlave.belly >= 10000>> You spread your legs as you shift into a more comfortable position, stealthily showing mercy since $he can't possibly keep $his <<if $activeSlave.bellyPreg >= 3000>>full-term belly<<else>>_belly belly<</if>> off you otherwise.<</if>> $He bobs up and down, getting you off without ever touching you<<if $PC.dick >= 1>>, other than the contact between your penis and the inside of $his body, of course<</if>>.
-=======
 		<<if $activeSlave.belly >= 10000>> You spread your legs as you shift into a more comfortable position, stealthily showing mercy since $he can't possibly keep $his <<if $activeSlave.bellyPreg >= 3000>>full-term belly<<else>>_belly belly<</if>> off you otherwise.<</if>> $He bobs up and down, getting you off without ever touching you<<if $PC.dick != 0>>, other than the contact between your penis and the inside of $his body, of course<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<if $activeSlave.energy > 80>>
 			$He has such a powerful sex drive that even this sterile intercourse brings $him to orgasm.
 		<<elseif $activeSlave.rules.release == "restrictive" || $activeSlave.rules.release == "chastity">>
@@ -20192,15 +19512,9 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<br><<link "Have $him lick you clean">>
 				<<replace "#result2">>
 					You recline in your chair and inform $activeSlave.slaveName that $he has one last thing to clean in your office. $He understands your meaning quickly, sinks to $his knees and <<if $activeSlave.belly >= 5000>>struggles to crawl<<else>>crawls<</if>> beneath your desk to kneel between your legs. Soon enough you feel the sensation of $his lips wrapping obediently about one of your toes, fellating the appendage with some enthusiasm. $He works $his way through your various digits, taking some solace in the simplicity of $his task, before a sudden understanding dawns on $him. $He runs $his tongue up your leg, cleansing your skin with $his tongue as best $he can, before heading for your
-<<<<<<< HEAD
-					<<if $PC.dick >= 1>>cock<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>cunt<</if>>
-					but you lay a hand on $his forehead and halt $him — $he'll do that last.
-					<<if $PC.boobs >= 1 || $PC.title == 0>>
-=======
 					<<if $PC.dick != 0>>cock<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>cunt<</if>>
 					but you lay a hand on $his forehead and halt $him — $he'll do that last.
 					<<if $PC.boobs >= 300 || $PC.title == 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 						Soon enough $he manages to lick all the way up from your feet to your breasts, cleansing your <<if $PC.belly >= 60000>>massively gravid <<elseif $PC.belly >= 5000>>motherly <</if>>body with $his wet tongue all the way. $He hesitates before teasingly laying a single lap on your nipples, so you take $his head and hold it against your breasts to enjoy $his skillful tongue on your nipples.<<if $PC.lactation > 0>> $He even gets a special treat to savor, fresh from $his <<= WrittenMaster($activeSlave)>>'s milky breasts. $He makes sure your sore breasts are sufficiently relieved.<</if>>
 					<<else>>
 						Soon enough $he manages to lick all the way up from your feet to your <<if $PC.belly >= 10000>>taut dome of a stomach<<elseif $PC.belly >= 5000>>pregnancy strained abs<<else>>abs<</if>>, pecs, and collarbone, cleansing your body with $his wet tongue all the way. $He lavishes particular attention on every nook and groove of your chiseled body, clearly eager to please $his muscular <<if $PC.belly >= 5000>>(and very pregnant) <</if>><<= WrittenMaster($activeSlave)>>.
@@ -20209,11 +19523,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 					<<if $PC.dick == 0>>
 						cunt, and laps at you enthusiastically
 					<<else>>
-<<<<<<< HEAD
-						cock, and runs $his tongue all over its surface<<if $PC.vagina >= 1>> before turning $his attentions to lavish the same wet service to your pussy<</if>>
-=======
 						cock, and runs $his tongue all over its surface<<if $PC.vagina != -1>> before turning $his attentions to lavish the same wet service to your pussy<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					<</if>>
 					This extravagant display of $his subservience leaves $him more sure of $his @@.hotpink;submission@@ to you than before.
 					<<set $activeSlave.counter.oral++, $oralTotal++, $activeSlave.devotion += 4>>
@@ -20787,11 +20097,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 		You hook your arms underneath $his own, pulling $him off of the ground in one swift yank upwards. Taken off guard by $his sudden vertical ascension, $he clings to your chest instinctively,
-<<<<<<< HEAD
-		<<if $PC.boobs >= 1 || $PC.title == 0>>
-=======
 		<<if $PC.boobs >= 300 || $PC.title == 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if $activeSlave.boobs > 25000>>$his immense udders doing their best to keep you apart<<elseif $activeSlave.boobs > 2000>>$his huge breasts squashing against yours<<elseif $activeSlave.boobs > 800>>$his breasts pressing heavily against yours<<else>>$his chest pressing against your breasts<</if>>.
 		<<else>>
 			<<if $activeSlave.boobs > 25000>>$his immense udders doing their best to keep you apart<<elseif $activeSlave.boobs > 2000>>$his huge breasts forming a soft cushion between your two bodies<<elseif $activeSlave.boobs > 800>>$his breasts pressing up against your hard chest pleasantly<<else>>$his chest pressing against yours<</if>>.
@@ -20799,11 +20105,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		$His body is held aloft entirely by your crushing embrace and $his arm<<if hasBothArms($activeSlave)>>s<</if>> wrapped daintily about your shoulders, for as short as $he is, $his attempts to wrap $his legs around your waist leave them dangling awkwardly in the air. This unique position soon has $his
 		<<if $activeSlave.belly >= 10000>>
 			_belly belly
-<<<<<<< HEAD
-			<<if $PC.dick >= 1>>
-=======
 			<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				trapping your dick against your own
 				<<if $PC.pregKnown == 1>>
 					pregnancy.
@@ -21055,15 +20357,9 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				You pull your chair back from your desk and order $him to lie on $his back with $his _belly belly to the ceiling. $He isn't sure what you are up to, but it quickly dawns on $him as you straddle $his stomach and take a seat. $He groans under the massive pressure increase inside $him, but does $his best to hold your weight.
 				<<if $activeSlave.preg > ($activeSlave.pregData.normalBirth / 4)>>
 					You manage to get very little work done. The sheer amount of motion
-<<<<<<< HEAD
-					<<if $PC.dick >= 1>>
-						beneath your balls
-						<<if $PC.vagina >= 1>>
-=======
 					<<if $PC.dick != 0>>
 						beneath your balls
 						<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 							and across your pussy quickly have your cock at full attention and pussy leaking femcum.
 						<<else>>
 							and between your legs quickly have your cock at full attention and dribbling precum.
@@ -21111,11 +20407,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <<link "Give $him a nice massage">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-		You sit on the couch next to your desk and pat your thighs. $He smiles and comes over, lowering $himself <<if $PC.dick == 0>>into your lap<<else>>onto your member<<if $PC.vagina >= 1>> and sliding a hand down to see to your pussy<</if>><</if>> without hesitation. You help $him get comfortable and instead of <<if $PC.dick == 0>>grinding<<else>>thrusting<</if>> or telling $him to ride, you just sit there with $him in your lap, gently massaging $his <<if $activeSlave.boobs < 900>>big <<else>>huge <</if>> tits. Despite their fine craftsmanship, implants are prone to rendering breasts sore, so $he's soon groaning with relief at the attention you lavish upon them. You finally manage to bring $him to orgasm with almost nothing but delicate stimulation of $his nipples, despite $his implants making them less sensitive than usual. @@.mediumaquamarine;$He has become more trusting of you.@@
-=======
 		You sit on the couch next to your desk and pat your thighs. $He smiles and comes over, lowering $himself <<if $PC.dick == 0>>into your lap<<else>>onto your member<<if $PC.vagina != -1>> and sliding a hand down to see to your pussy<</if>><</if>> without hesitation. You help $him get comfortable and instead of <<if $PC.dick == 0>>grinding<<else>>thrusting<</if>> or telling $him to ride, you just sit there with $him in your lap, gently massaging $his <<if $activeSlave.boobs < 900>>big <<else>>huge <</if>> tits. Despite their fine craftsmanship, implants are prone to rendering breasts sore, so $he's soon groaning with relief at the attention you lavish upon them. You finally manage to bring $him to orgasm with almost nothing but delicate stimulation of $his nipples, despite $his implants making them less sensitive than usual. @@.mediumaquamarine;$He has become more trusting of you.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.trust += 4>>
 	<</replace>>
 <</link>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 31ec6537c7cb79795bd7d181487c864048c9ef5f..70eeceeefb8d4f3d53447b98898b812c8c33b691 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -638,11 +638,7 @@ $activeSlave.slaveName chuckles into $subSlave.slaveName's ear, crooning,
 	"You <<s>>tupid <<s>>lut. Too bad you never went to <<s>>chool, maybe you could have learned <<s>>omething and not ended up a<<s>> a fuck <<s>>lave."
 <</if>>
 <<setSpokenPlayerPronouns $activeSlave>>
-<<<<<<< HEAD
-$He grinds against the wilting $subSlave.slaveName, and then continues, "I felt your <<if ($subSlave.butt > 4)>>fat butt<<elseif ($subSlave.butt > 2)>>big butt<<else>>tiny little butt<</if>> clench ju<<s>>t now." $He gives $subSlave.slaveName's <<if ($subSlave.balls > 0 && $subSlave.scrotum > 0)>>balls a gentle squeeze<<elseif ($subSlave.dick > 0)>>dick a gentle tug<<elseif $subSlave.vagina == -1>>butthole a gentle massage<<else>>pussylips a gentle massage<</if>>. "<<HeP>> ha<<s>>n't fucked you back there yet, ha<<s>> <<heP>>? It'<<s>> going to hurt, you little bitch. <<HeP>>'<<s>> going to hold you down and <<sh>>ove <<hisP>> <<if $PC.dick >= 1>>huge cockhead<<else>>bigge<<s>>t <<s>>trap-on<</if>> right up again<<s>>t thi<<s>> tight little hole." $He gropes the quivering slave's virgin anus, careful not to penetrate it. "You're going to do your be<<s>>t to relax like a good little _girl2. But it'<<s>> going to be so big. It'<<s>> going to burn. And then you're going to panic, and <<s>>truggle, and <<heP>>'<<s>> going to hold you down and rape your butt while you <<s>>cream and cry."
-=======
 $He grinds against the wilting $subSlave.slaveName, and then continues, "I felt your <<if ($subSlave.butt > 4)>>fat butt<<elseif ($subSlave.butt > 2)>>big butt<<else>>tiny little butt<</if>> clench ju<<s>>t now." $He gives $subSlave.slaveName's <<if ($subSlave.balls > 0 && $subSlave.scrotum > 0)>>balls a gentle squeeze<<elseif ($subSlave.dick > 0)>>dick a gentle tug<<elseif $subSlave.vagina == -1>>butthole a gentle massage<<else>>pussylips a gentle massage<</if>>. "<<HeP>> ha<<s>>n't fucked you back there yet, ha<<s>> <<heP>>? It'<<s>> going to hurt, you little bitch. <<HeP>>'<<s>> going to hold you down and <<sh>>ove <<hisP>> <<if $PC.dick != 0>>huge cockhead<<else>>bigge<<s>>t <<s>>trap-on<</if>> right up again<<s>>t thi<<s>> tight little hole." $He gropes the quivering slave's virgin anus, careful not to penetrate it. "You're going to do your be<<s>>t to rela<<x>> like a good little _girl2. But it'<<s>> going to be so big. It'<<s>> going to burn. And then you're going to panic, and <<s>>truggle, and <<heP>>'<<s>> going to hold you down and rape your butt while you <<s>>cream and cry."
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 <br><br>
 $subSlave.slaveName keeps _his2 eyes clamped shut and _his2 hand<<if hasBothArms($subSlave)>>s<</if>> down at _his2 side<<if hasBothArms($subSlave)>>s<</if>>, balled into <<if !hasBothArms($subSlave)>>a <</if>>fist<<if hasBothArms($subSlave)>>s<</if>>, but _his2 self-control finally cracks and _he2 lets out a great gasping sob before bursting into tears.
 
@@ -1062,11 +1058,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 	You move in. $activeSlave.slaveName <<if canSee($activeSlave)>>catches sight of<<else>>notices<</if>> your approach, and you see the corners of $his mouth quirk upward. $He breaks the lip lock and says breathily, "Hey $subSlave.slaveName, I think there'<<s>> <<s>>omething el<<s>>e you <<sh>>ould ta<<s>>te te<<s>>t."
 	<br><br>
 	<<run Enunciate($subSlave)>>
-<<<<<<< HEAD
-	"Whaa-" the slave starts to ask warily before $activeSlave.slaveName pushes _him2 to _his2 knees, spinning _him2 around as $he does so. This brings $subSlave.slaveName face to face with your <<if $PC.dick >= 1>>stiff prick, a bead of precum already present at its tip<<else>>wet cunt, a bead of pussyjuice already trailing down your inner thigh<</if>>. "Oh, um, hi <<Master $subSlave>>," _he2 stammers, and then starts to <<if $PC.dick >= 1>>suck your dick<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eat your pussy<</if>>. This leaves poor $activeSlave.slaveName without anyone to make out with, so you step in there, grabbing $him and pulling the giggling slave in to kiss $him deeply. $His mouth is indeed a bit <<if $activeSlave.preg > $activeSlave.pregData.normalBirth/2>>sour<<else>>tart<</if>>. $He moans into your mouth as $he feels $his nipples press against <<if $PC.boobs >= 1>>yours<<else>>your hard chest<</if>>, and then again as your tongue invades $him. When you <<if $PC.dick >= 1>>fill $subSlave.slaveName's mouth with cum<<else>>climax wetly against $subSlave.slaveName's mouth<</if>>, you pull away slightly, letting the slave on _his2 knees below you gasp "You ta<<s>>te great, <<Master>>!" before you spin _him2 around in turn so _he2 can give $activeSlave.slaveName $his own allotment of oral sex. You leave them to it. They @@.mediumaquamarine;trust you a bit more@@ after such a lighthearted little escapade.
-=======
 	"Whaa-" the slave starts to ask warily before $activeSlave.slaveName pushes _him2 to _his2 knees, spinning _him2 around as $he does so. This brings $subSlave.slaveName face to face with your <<if $PC.dick != 0>>stiff prick, a bead of precum already present at its tip<<else>>wet cunt, a bead of pussyjuice already trailing down your inner thigh<</if>>. "Oh, um, hi <<Master $subSlave>>," _he2 stammers, and then starts to <<if $PC.dick != 0>>suck your dick<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat your pussy<</if>>. This leaves poor $activeSlave.slaveName without anyone to make out with, so you step in there, grabbing $him and pulling the giggling slave in to kiss $him deeply. $His mouth is indeed a bit <<if $activeSlave.preg > $activeSlave.pregData.normalBirth/2>>sour<<else>>tart<</if>>. $He moans into your mouth as $he feels $his nipples press against <<if $PC.boobs >= 300>>yours<<else>>your hard chest<</if>>, and then again as your tongue invades $him. When you <<if $PC.dick != 0>>fill $subSlave.slaveName's mouth with cum<<else>>climax wetly against $subSlave.slaveName's mouth<</if>>, you pull away slightly, letting the slave on _his2 knees below you gasp "You ta<<s>>te great, <<Master>>!" before you spin _him2 around in turn so _he2 can give $activeSlave.slaveName $his own allotment of oral sex. You leave them to it. They @@.mediumaquamarine;trust you a bit more@@ after such a lighthearted little escapade.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<set $activeSlave.trust += 2, $subSlave.trust += 2, $subSlave.counter.oral += 2>>
 	<<set $oralTotal += 2>>
 	<<set $slaves[$slaveIndices[$subSlave.ID]] = $subSlave>>
@@ -1264,15 +1256,9 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 <br><<link "Dominate the slave on top">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-	You make no reply, but <<if $PC.dick >= 1>>advance on the couch, stripping down to reveal a raging erection<<if $PC.vagina >= 1>> and ready cunt<</if>>.<<else>>move to a side table, selecting a formidable strap-on.<</if>> <<if canSee($activeSlave)>>Seeing<<elseif canHear($activeSlave)>>Hearing<<else>>Acknowledging<</if>> this, $activeSlave.slaveName @@.hotpink;giggles with anticipation,@@ and pulls $subSlave.slaveName's knees back farther. The slave whines at the stretch, and then gasps as the invading phallus pops free of _his2 asshole. _His2 anus <<if $subSlave.anus > 2>>gapes lewdly, its sphincter so well stretched that it stays invitingly open,<<elseif $subSlave.anus > 1>>gapes slightly, its sphincter remaining just barely open,<<else>>closes up again immediately once it's no longer being penetrated. Its rosebud is<</if>> glistening with lube<<if canPenetrate($activeSlave)>> and precum from $activeSlave.slaveName's cock<</if>>. But you decide to be more circumspect. Pressing your <<if $PC.dick >= 1>>dickhead<<else>>phallus<</if>> into $subSlave.slaveName's mouth, you tell _him2 to be thorough with _his2 saliva<<if $PC.vagina >= 1>> and not to worry about your pussy<</if>>. _His2 eyes widen at the implication, and _he2 starts to suck lushly.
-	<br><br>
-	Suddenly, _he2 jerks and squeals into your <<if $PC.dick >= 1>>dick<<else>>crotch<</if>>. With you standing there, $activeSlave.slaveName can't really see much, and $he can't drop $subSlave.slaveName's legs without throwing everything into confusion. So, $he's reduced to blind jabs to get $his <<if canPenetrate($activeSlave)>>cock<<else>>strap-on<</if>> back up the poor slave's butt. It takes $him quite a while to manage it, and when $he's finally seated, $subSlave.slaveName gives as huge a sigh as _he2 can manage with a phallus down _his2 throat. _His2 relief is short lived, however, because soon afterward, you withdraw, leaving a string of spit between _his2 wet lips and the <<if $PC.dick >= 1>>head of your turgid cock<<else>>massive head of your strap-on<</if>>.
-=======
 	You make no reply, but <<if $PC.dick != 0>>advance on the couch, stripping down to reveal a raging erection<<if $PC.vagina != -1>> and ready cunt<</if>>.<<else>>move to a side table, selecting a formidable strap-on.<</if>> <<if canSee($activeSlave)>>Seeing<<elseif canHear($activeSlave)>>Hearing<<else>>Acknowledging<</if>> this, $activeSlave.slaveName @@.hotpink;giggles with anticipation,@@ and pulls $subSlave.slaveName's knees back farther. The slave whines at the stretch, and then gasps as the invading phallus pops free of _his2 asshole. _His2 anus <<if $subSlave.anus > 2>>gapes lewdly, its sphincter so well stretched that it stays invitingly open,<<elseif $subSlave.anus > 1>>gapes slightly, its sphincter remaining just barely open,<<else>>closes up again immediately once it's no longer being penetrated. Its rosebud is<</if>> glistening with lube<<if canPenetrate($activeSlave)>> and precum from $activeSlave.slaveName's cock<</if>>. But you decide to be more circumspect. Pressing your <<if $PC.dick != 0>>dickhead<<else>>phallus<</if>> into $subSlave.slaveName's mouth, you tell _him2 to be thorough with _his2 saliva<<if $PC.vagina != -1>> and not to worry about your pussy<</if>>. _His2 eyes widen at the implication, and _he2 starts to suck lushly.
 	<br><br>
 	Suddenly, _he2 jerks and squeals into your <<if $PC.dick != 0>>dick<<else>>crotch<</if>>. With you standing there, $activeSlave.slaveName can't really see much, and $he can't drop $subSlave.slaveName's legs without throwing everything into confusion. So, $he's reduced to blind jabs to get $his <<if canPenetrate($activeSlave)>>cock<<else>>strap-on<</if>> back up the poor slave's butt. It takes $him quite a while to manage it, and when $he's finally seated, $subSlave.slaveName gives as huge a sigh as _he2 can manage with a phallus down _his2 throat. _His2 relief is short lived, however, because soon afterward, you withdraw, leaving a string of spit between _his2 wet lips and the <<if $PC.dick != 0>>head of your turgid cock<<else>>massive head of your strap-on<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<br><br>
 	<<if $subSlave.vagina > 0>>
 		With $activeSlave.slaveName occupying $subSlave.slaveName's rear hole, your next step is obvious to everyone involved, and _he2 groans with fullness as _he2 feels _his2 cunt accommodate you. $activeSlave.slaveName matches $his rhythm to yours, and <<if canPenetrate($activeSlave)>>orgasms promptly, since $he's less accustomed than you are to the delectable sensation of a _girl2 tightened by a phallus in _his2 other hole<<else>>climaxes quickly despite having no sensation in $his fake dick, since $he finds the situation so arousing<</if>>.
@@ -1501,11 +1487,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 	<<else>>
 		feminine
 	<</if>>
-<<<<<<< HEAD
-	thighs, past your <<if $PC.dick >= 1>>turgid dick<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>flushed pussy<</if>>, across your
-=======
 	thighs, past your <<if $PC.dick != 0>>turgid dick<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>flushed pussy<</if>>, across your
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<if $PC.belly >= 100000>>
 		massively pregnant middle
 	<<elseif $PC.belly >= 10000>>
@@ -1541,11 +1523,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 	<<else>>
 		cute breasts
 	<</if>>
-<<<<<<< HEAD
-	to rest on your unforgiving face<<else>>a pleased chuckle out of you. With dawning comprehension, _his2 face rapidly moves to face yours<</if>>. _He2 wilts. $activeSlave.slaveName thinks this is hilarious, and laughs so hard at the slave's reaction to your appearance that $he almost loses hold of $subSlave.slaveName's <<if $subSlave.dick > 0>>cock<<elseif $subSlave.clit > 0>>clit<<else>>ass<</if>>. There's nothing quite like oral from a _girl2 who's moaning with anal pain, so you sit on the head of the bedroll and <<if $PC.dick >= 1>>stick your dick in $subSlave.slaveName's mouth<<else>>pull $subSlave.slaveName's mouth against your cunt<</if>>. $activeSlave.slaveName is still giggling, but leans over the unhappy slave speared between the two of you to @@.hotpink;plant a kiss@@ on you. $He misses, smearing $his kiss along your cheek and past your ear, but you take $his face in your hands and kiss $him properly as $subSlave.slaveName begins to do _his2 best to relax and get you off, @@.gold;fearful@@ that worse is in store if _he2 doesn't @@.hotpink;submit.@@
-=======
 	to rest on your unforgiving face<<else>>a pleased chuckle out of you. With dawning comprehension, _his2 face rapidly moves to face yours<</if>>. _He2 wilts. $activeSlave.slaveName thinks this is hilarious, and laughs so hard at the slave's reaction to your appearance that $he almost loses hold of $subSlave.slaveName's <<if $subSlave.dick > 0>>cock<<elseif $subSlave.clit > 0>>clit<<else>>ass<</if>>. There's nothing quite like oral from a _girl2 who's moaning with anal pain, so you sit on the head of the bedroll and <<if $PC.dick != 0>>stick your dick in $subSlave.slaveName's mouth<<else>>pull $subSlave.slaveName's mouth against your cunt<</if>>. $activeSlave.slaveName is still giggling, but leans over the unhappy slave speared between the two of you to @@.hotpink;plant a kiss@@ on you. $He misses, smearing $his kiss along your cheek and past your ear, but you take $his face in your hands and kiss $him properly as $subSlave.slaveName begins to do _his2 best to relax and get you off, @@.gold;fearful@@ that worse is in store if _he2 doesn't @@.hotpink;submit.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<set $activeSlave.devotion += 4>>
 	<<if canPenetrate($activeSlave)>>
 		<<set $activeSlave.counter.penetrative++, $penetrativeTotal++>>
@@ -1728,22 +1706,14 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 <<link "They're not done yet">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-	$subSlave.slaveName is out of it, and doesn't realize you're there. The first indication _he2 gets of your presence is the <<if $PC.dick >= 1>>head of your penis<<else>>tip of your strap-on<</if>> <<if $subSlave.anus > 2>>sliding easily inside _his2 soft butthole<<elseif $subSlave.anus > 1>>pushing firmly up _his2 relaxed anus<<else>>penetrating _his2 tight little asshole<</if>>. _He2 groans, but greets you properly, slurring a little from sheer fatigue and overstimulation. Nevertheless, _he2 reaches clumsily around to spread _his2 cheeks for you. As you begin to fuck _his2 butt, your invading <<if $PC.dick >= 1>>cock<<else>>phallus<</if>>
-=======
 	$subSlave.slaveName is out of it, and doesn't realize you're there. The first indication _he2 gets of your presence is the <<if $PC.dick != 0>>head of your penis<<else>>tip of your strap-on<</if>> <<if $subSlave.anus > 2>>sliding easily inside _his2 soft butthole<<elseif $subSlave.anus > 1>>pushing firmly up _his2 relaxed anus<<else>>penetrating _his2 tight little asshole<</if>>. _He2 groans, but greets you properly, slurring a little from sheer fatigue and overstimulation. Nevertheless, _he2 reaches clumsily around to spread _his2 cheeks for you. As you begin to fuck _his2 butt, your invading <<if $PC.dick != 0>>cock<<else>>phallus<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<if canPenetrate($subSlave)>>
 		<<if $subSlave.prostate>>presses against _his2 prostate<<else>>stirs up _his2 insides<</if>>, forcing _him2 hard again.
 	<<else>>
 		and thrusting hips get _him2 moving again, too.
 	<</if>>
 	Beneath _him2, $activeSlave.slaveName shifts uncomfortably at the resumed sex and the extra weight. To relieve $him, you haul $his <<if $activeSlave.relationship > 4>>_wife2<<else>>lover<</if>> into a more upright position so _he2 can fuck and be fucked while straddling $activeSlave.slaveName's pressed-together thighs. You fuck $subSlave.slaveName just as hard as _he2 was fucking $activeSlave.slaveName, taking your pleasure from _him2 without mercy. Despite this, the sexed-out slave orgasms again.
-<<<<<<< HEAD
-	<<if ($PC.dick >= 1) && (canPenetrate($subSlave))>>Deciding to really fill $activeSlave.slaveName, you shove $subSlave.slaveName's quivering body off to one side without ceremony, shove yourself inside the $desc on the bottom, and add your cum to the two loads already inside $him.<<else>>You climax yourself, and then stand.<</if>>
-=======
 	<<if ($PC.dick != 0) && (canPenetrate($subSlave))>>Deciding to really fill $activeSlave.slaveName, you shove $subSlave.slaveName's quivering body off to one side without ceremony, shove yourself inside the $desc on the bottom, and add your cum to the two loads already inside $him.<<else>>You climax yourself, and then stand.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	Pleased, you head off to find more amusement, leaving the sex-stained slaves dozing in each other's arms, @@.hotpink;not thinking for a moment@@ about how profoundly sexual pleasure dominates their lives.
 	<<= VCheck.Simple()>>
 	<<set $activeSlave.devotion += 4>>
diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw
index 105748645a51231867500ab669c3ca9b0890dac3..2ba9c7e6de3d5fa7fe8428064eff16bcccc755ea 100644
--- a/src/uncategorized/arcologyDescription.tw
+++ b/src/uncategorized/arcologyDescription.tw
@@ -51,21 +51,12 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
 		<<set _statue = "female">>
 	<</if>>
 	Outside the main entrance, there is an enormous statue of an idealized
-<<<<<<< HEAD
-	<<if ($PC.dick >= 1)>><<if ($PC.vagina >= 1)>>futanari<<elseif ($PC.boobs >= 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure with several statues of nude slaves at its feet.
-	<<if $arcologies[0].FSStatuesqueGlorification == 100>>
-		The central <<if ($PC.dick >= 1)>><<if ($PC.vagina >= 1)>>futanari<<elseif ($PC.boobs >= 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure towers over the area.
-	<</if>>
-	<<if $arcologies[0].FSSupremacistDecoration == 100>>
-		The central <<if ($PC.dick >= 1)>><<if ($PC.vagina >= 1)>>futanari<<elseif ($PC.boobs >= 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure has distinctly $arcologies[0].FSSupremacistRace features.
-=======
 	 figure with several statues of nude slaves at its feet.
 	<<if $arcologies[0].FSStatuesqueGlorification == 100>>
 		The central _statue figure towers over the area.
 	<</if>>
 	<<if $arcologies[0].FSSupremacistDecoration == 100>>
 		The central _statue figure has distinctly $arcologies[0].FSSupremacistRace features.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<</if>>
 	<<if $arcologies[0].FSSubjugationistDecoration == 100>>
 		The slaves have exaggerated $arcologies[0].FSSubjugationistRace features.
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index cb396320bdfb4a0e1ca0e54c0547413df910bf96..921c790d269eedaff04fa21e6a75eb6c23307091 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -70,11 +70,7 @@
 	<</if>>
 	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Reputation')">Reputation</button>
 	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Business')">Personal Business</button>
-<<<<<<< HEAD
-	<<if ($PC.boobs >= 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>>
-=======
 	<<if $PC.boobs >= 1000 || $PC.pregKnown == 1 || $playerAging != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Personal')">Personal Notes</button>
 	<</if>>
 </div>
@@ -133,11 +129,7 @@
 	</div>
 </div>
 
-<<<<<<< HEAD
-<<if ($PC.boobs >= 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>>
-=======
 <<if $PC.boobs >= 1000 || $PC.pregKnown == 1 || $playerAging != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<div id="Personal" class="tabcontent">
 		<div class="content">
 			<<include "Personal Notes">>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 4c504d7caae3145697c0140db838b4f8057fd228..d21f6e7bf2129cd3c13144cb61eeefa25e23e604 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -675,11 +675,7 @@ is
 	<<case "judgemental">>
 		$He is @@.red;sexually judgemental,@@ and often denigrates $his sexual partners' performance.
 	<<case "cum addict">>
-<<<<<<< HEAD
-		$He's a @@.yellow;cum addict:@@ $he has a deep psychological addiction to <<if $PC.dick >= 1>>semen<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>pussyjuice<</if>> and becomes anxious if $he goes for a few hours without drinking any.
-=======
 		$He's a @@.yellow;cum addict:@@ $he has a deep psychological addiction to <<if $PC.balls > 0>>semen<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>pussyjuice<</if>> and becomes anxious if $he goes for a few hours without drinking any.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<case "anal addict">>
 		$He's an @@.yellow;anal addict:@@ $he has a deep psychological need to be fucked in the ass and becomes anxious if $he goes for a few hours without anal.
 	<<case "attention whore">>
diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw
index 048b0feaf2259e4a1d70071f98cdf778233346dc..da256b995d0c278b6e8c2b846ef54c9b79c53a7c 100644
--- a/src/uncategorized/matchmaking.tw
+++ b/src/uncategorized/matchmaking.tw
@@ -256,48 +256,6 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
 	<</if>>
 	<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> marries $him to you in a brief ceremony adapted for slaves and their owners. You place a simple steel ring on <<if hasAnyArms($eventSlave)>>$his finger<<else>>a string around $his neck<</if>>; $he does not reciprocate, since this marriage does not bind you.
 	<<if $assistant == 0>>
-<<<<<<< HEAD
-		"The marriage protocol now requires you to <<if $PC.dick >= 1>>fellate<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>perform cunnilingus on<</if>> the <<if $PC.title == 1>>groom<<else>>the bride<</if>>," $assistantName orders $him, and $he hurries to obey.
-	<<else>>
-		<<if $assistantAppearance == "monstergirl">>
-			"To consecrate the ceremony," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar begins to play with _hisA dicks.
-		<<elseif $assistantAppearance == "shemale">>
-			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar starts to jill off.
-		<<elseif $assistantAppearance == "amazon">>
-			"To complete this ritual," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar starts to jill off.
-		<<elseif $assistantAppearance == "businesswoman">>
-			"To consecrate the marriage," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick >= 1>>fellate<<else>>perform cunnilingus on<</if>> the <<if $PC.title == 1>>groom<<else>>the bride<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar sneaks a hand down _hisA suit skirt, blushing furiously.
-		<<elseif $assistantAppearance == "fairy">>
-			"To seal the deal," $assistantName concludes, "$eventSlave.slaveName, you gotta drink the <<if $PC.title == 1>>groom's <<else>>bride's <</if>><<if $PC.dick >= 1>>semen<<if $PC.vagina >= 1>> and pussy juices<</if>><<else>>pussy juices<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar spreads _hisA legs while still hovering in the air and masturbates eagerly through _hisA half-worn robes.
-		<<elseif $assistantAppearance == "pregnant fairy">>
-			"To seal the deal," $assistantName concludes, "$eventSlave.slaveName, you gotta drink the <<if $PC.title == 1>>groom's <<else>>bride's <</if>><<if $PC.dick >= 1>>semen<<if $PC.vagina >= 1>> and pussy juices<</if>><<else>>pussy juices<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's pregnant avatar curls while still hovering in the air and masturbates eagerly around _hisA large belly.
-		<<elseif $assistantAppearance == "goddess">>
-			"To consummate the marriage," $assistantName concludes, "$eventSlave.slaveName, you must now <<if $PC.dick >= 1>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s seed<<else>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s female juices<</if>>." The slave complies eagerly. $assistantName's avatar looks on approvingly, cradling _hisA perpetual pregnancy.
-		<<elseif $assistantAppearance == "hypergoddess">>
-			"To consummate the marriage," $assistantName concludes, "$eventSlave.slaveName, you must now <<if $PC.dick >= 1>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s seed<<else>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s female juices<</if>>." The slave complies eagerly. $assistantName's avatar looks on approvingly, cradling _hisA massive perpetual pregnancy.
-		<<elseif $assistantAppearance == "loli">>
-			"To consummate the marriage," $assistantName concludes, "$eventSlave.slaveName, you should now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina >= 1>>and lick their cunny.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunny<</if>>." The slave complies eagerly. $assistantName's avatar sneaks a hand down _hisA dress, blushing furiously.
-		<<elseif $assistantAppearance == "preggololi">>
-			"To consummate the marriage," $assistantName concludes, "$eventSlave.slaveName, you should now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s lovely cock<<if $PC.vagina >= 1>>and eat out their cunt.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunt<</if>>." The slave complies eagerly. $assistantName's avatar attempts to sneak a hand down _hisA dress, but is thwarted by _hisA belly. _HeA instead openly rubs _hisA crotch through the front of _hisA dress, blushing furiously.
-		<<elseif $assistantAppearance == "schoolgirl">>
-			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, the rules say you should now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar starts to jill off.
-		<<elseif $assistantAppearance == "angel">>
-			"To consummate the marriage," $assistantName concludes, "$eventSlave.slaveName, you must now join <<= PlayerName()>> in their bedroom and consummate this marriage." The slave looks confused. "After the wedding ends, would be the time." $assistantName says, covering _hisA face in embarrassment at the thought.
-		<<elseif $assistantAppearance == "cherub">>
-			"To consummate the marriage," $assistantName concludes, "$eventSlave.slaveName, you should <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina >= 1>>and lick their pussy,<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s pussy<</if>>, in the privacy of <<= PlayerName()>>'s bedroom, of course." $assistantName hides _hisA face in _hisA hands at the thought.
-		<<elseif $assistantAppearance == "incubus">>
-			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Enjoying the sight, $assistantName's avatar begins to furiously stroke its shaft.
-		<<elseif $assistantAppearance == "succubus">>
-			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar pulls out a large dildo and begins ramming it into _hisA own pussy.
-		<<elseif $assistantAppearance == "imp">>
-			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar hikes _hisA robe and vigorously rubs _hisA pussy.
-		<<elseif $assistantAppearance == "witch">>
-			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. $assistantName's avatar begins to fidget at the sight, having summoned a vibrator beforehand and accidentally linked it to your pleasure.
-		<<elseif $assistantAppearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
-			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. $assistantName's avatar begins to swell, drawing all its gained mass to its midsection. Its gravid middles splits vertically, allowing a new mass of flesh to fall to the floor, which quickly grows and reshapes itself into a spitting image of yourself. Meanwhile, the original twists into an image of $eventSlave.slaveName. $assistantName's two avatars begin copying you and $eventSlave.slaveName's actions perfectly.
-		<<else>>
-			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, the rules say you should now <<if $PC.dick >= 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina >= 1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. With only a symbol to express _hisA approval, $assistantName is forced to content _himselfA with spinning the symbol and making it glow in time with your new slave $wife's efforts.
-=======
 		"The marriage protocol now requires you to <<if $PC.dick != 0>>fellate<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>perform cunnilingus on<</if>> the <<if $PC.title == 1>>groom<<else>>the bride<</if>>," $assistantName orders $him, and $he hurries to obey.
 	<<else>>
 		<<if $assistantAppearance == "monstergirl">>
@@ -338,7 +296,6 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
 			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. $assistantName's avatar begins to swell, drawing all its gained mass to its midsection. Its gravid middles splits vertically, allowing a new mass of flesh to fall to the floor, which quickly grows and reshapes itself into a spitting image of yourself. Meanwhile, the original twists into an image of $eventSlave.slaveName. $assistantName's two avatars begin copying you and $eventSlave.slaveName's actions perfectly.
 		<<else>>
 			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, the rules say you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. With only a symbol to express _hisA approval, $assistantName is forced to content _himselfA with spinning the symbol and making it glow in time with your new slave $wife's efforts.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<</if>>
 		"Done," _heA says when you climax. "Enjoy your
 		<<if ($eventSlave.fetishKnown == 1) && ($eventSlave.fetishStrength > 60)>>
@@ -401,11 +358,7 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
 			<</replace>>
 		<</link>> //This will involve the slave having sex with a very large number of citizens//
 	<</if>>
-<<<<<<< HEAD
-	<<if isFertile($eventSlave) && ($PC.dick >= 1)>>
-=======
 	<<if isFertile($eventSlave) && ($PC.dick != 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Impregnation ceremony">>
 			<<replace "#result2">>
 			You order $assistantName to invite deserving citizens to a ceremony for a fertile slave being married to a slaveowner, and to make the arrangements. The wedding will take place during the upcoming week.
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 1a72a386930ab2ef5e1468c123024200f449539d..54a4dc5b86f417eac68f0d7f8e26f66aa535f47b 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -221,44 +221,28 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 		<</if>>
 	<</if>>
 <<elseif ($activeSlave.boobs > 400) && ($activeSlave.dick > 0)>>
-<<<<<<< HEAD
-	<<if ($PC.dick >= 1) && (($PC.boobs >= 1) || ($PC.vagina >= 1))>>
-=======
 	<<if ($PC.dick != 0) && (($PC.boobs >= 400) || ($PC.vagina != -1))>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		$He looks to you and sees a fellow intersex person, and is @@.mediumaquamarine;rather hopeful@@ that $he will find you a sympathetic owner.
 		<<set $activeSlave.trust += 4>>
 	<</if>>
 <</if>>
 
 <<if (($activeSlave.attrXX > 50) || ($activeSlave.energy > 95)) && ($activeSlave.behavioralFlaw != "hates women") && ($activeSlave.trust >= -20)>>
-<<<<<<< HEAD
-	<<if ($PC.boobs >= 1)>>
-=======
 	<<if ($PC.boobs >= 400)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		$He seems to think you're pretty, and is more willing to @@.hotpink;try for your approval@@ than $he would otherwise be. $He glances at your rack when $he thinks you're not looking.
 		<<set $activeSlave.devotion += 4>>
 	<</if>>
 <</if>>
 
 <<if ($activeSlave.behavioralFlaw == "hates women") && ($activeSlave.devotion <= 50)>>
-<<<<<<< HEAD
-	<<if ($PC.dick == 0) && ($PC.boobs >= 1)>>
-=======
 	<<if ($PC.dick == 0) && ($PC.boobs >= 300)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		$He obviously does not find you immediately attractive, and is @@.mediumorchid;less eager to conciliate you@@ than $he would otherwise be.
 		<<set $activeSlave.devotion -= 5>>
 	<</if>>
 <</if>>
 
 <<if (($activeSlave.attrXY > 50) || ($activeSlave.energy > 95)) && ($activeSlave.behavioralFlaw != "hates men") && ($activeSlave.trust >= -20)>>
-<<<<<<< HEAD
-	<<if ($PC.dick >= 1) && ($PC.boobs == 0)>>
-=======
 	<<if ($PC.dick == 0) && ($PC.boobs < 300)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		$He seems to think you're handsome, and is more willing to @@.hotpink;try for your approval@@ than $he would otherwise be. $He glances at your crotch when $he thinks you're not looking.
 		<<set $activeSlave.devotion += 4>>
 	<</if>>
@@ -811,11 +795,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 	<<if ($activeSlave.indentureRestrictions <= 0) && ($seeExtreme == 1)>>
 		| <<link "Cruelly castrate $him">>
 			<<replace "#introResult">>
-<<<<<<< HEAD
-				You rise from your desk and move in close, wordlessly dominating $him without touch, tempting and overawing $him until $he's desperate with desire, $his prick stiff as iron. $He follows you willingly into the autosurgery and even allows you to strap $him in, face-down, without comment. $His fuckhole welcomes your <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> and $he gasps with pleasure. $He climaxes with indecent speed, dripping $his cum onto the surgery floor. You keep fucking $him, but lean forward to whisper to $him that that was $his last hard-on. $He's completely confused and says nothing, but gradually realizes what the numb feeling around $his ballsack means. $He @@.gold;screams with horror@@ and @@.mediumorchid;sobs disconsolately@@ as the autosurgery disengages from $his clipped genitals and you disengage from $his <<if $PC.dick >= 1>>cum-filled<<else>>wilting<</if>> butthole. $He gingerly stumbles back to your office with you and, without even being ordered to, arranges $himself on the couch with $his fuckhole ready. The gelding does affect $his @@.red;health@@ somewhat.
-=======
 				You rise from your desk and move in close, wordlessly dominating $him without touch, tempting and overawing $him until $he's desperate with desire, $his prick stiff as iron. $He follows you willingly into the autosurgery and even allows you to strap $him in, face-down, without comment. $His fuckhole welcomes your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> and $he gasps with pleasure. $He climaxes with indecent speed, dripping $his cum onto the surgery floor. You keep fucking $him, but lean forward to whisper to $him that that was $his last hard-on. $He's completely confused and says nothing, but gradually realizes what the numb feeling around $his ballsack means. $He @@.gold;screams with horror@@ and @@.mediumorchid;sobs disconsolately@@ as the autosurgery disengages from $his clipped genitals and you disengage from $his <<if $PC.dick != 0>>cum-filled<<else>>wilting<</if>> butthole. $He gingerly stumbles back to your office with you and, without even being ordered to, arranges $himself on the couch with $his fuckhole ready. The gelding does affect $his @@.red;health@@ somewhat.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<</replace>>
 			<<set $activeSlave.devotion -= 10>>
 			<<set $activeSlave.trust -= -10>>
@@ -850,11 +830,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 	<<if canDoAnal($activeSlave)>>
 		| <<link "Make sure $he knows $he made a mistake">>
 			<<replace "#introResult">>
-<<<<<<< HEAD
-				You tell $him that slaves working in your penthouse are all expected to please you, and $he nods eagerly. $He strips, only starting to look doubtful again when you brusquely order $him to hurry up. You order $him to get down on the ground with $his face up, $his shoulders against the floor; $he does, and then you order $him to put $his legs over $his head. $He looks puzzled but does, flipping $himself flexibly up until $he's doing a shoulder stand, bent double with $his crotch over $his face. You stand over $him and shove <<if $PC.dick >= 1>>your cock<<else>>a strap-on<</if>> down and into $his asshole. This is an advanced anal position and <<if $activeSlave.anus > 0>>although $he's clearly no<<else>>even for an<</if>> anal virgin it's well beyond $him. $He does $his best but tears begin to streak $his cheeks. After a while you tire of the position and flip $him over onto $his face to assrape $him doggy style. This allows you to whisper into $his ear that $his holes are your property now, to use, to abuse, or to sell. $He @@.mediumorchid;sobs in despair@@ at the latter, knowing $he's @@.gold;thrown $his life away.@@
-=======
 				You tell $him that slaves working in your penthouse are all expected to please you, and $he nods eagerly. $He strips, only starting to look doubtful again when you brusquely order $him to hurry up. You order $him to get down on the ground with $his face up, $his shoulders against the floor; $he does, and then you order $him to put $his legs over $his head. $He looks puzzled but does, flipping $himself flexibly up until $he's doing a shoulder stand, bent double with $his crotch over $his face. You stand over $him and shove <<if $PC.dick != 0>>your cock<<else>>a strap-on<</if>> down and into $his asshole. This is an advanced anal position and <<if $activeSlave.anus > 0>>although $he's clearly no<<else>>even for an<</if>> anal virgin it's well beyond $him. $He does $his best but tears begin to streak $his cheeks. After a while you tire of the position and flip $him over onto $his face to assrape $him doggy style. This allows you to whisper into $his ear that $his holes are your property now, to use, to abuse, or to sell. $He @@.mediumorchid;sobs in despair@@ at the latter, knowing $he's @@.gold;thrown $his life away.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<</replace>>
 			<<set $activeSlave.devotion -= 5>>
 			<<set $activeSlave.trust -= 10>>
@@ -913,11 +889,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 	<<if canDoAnal($activeSlave)>>
 		<<link "Introduce $him to getting fucked">>
 			<<replace "#introResult">>
-<<<<<<< HEAD
-				You stand up, your <<if $PC.dick >= 1>>erection<<if $PC.vagina >= 1>> and the pussy beneath it<</if>><<else>>strap-on<</if>> suddenly becoming visible to $him, and order $him in a conversational tone of voice to kneel on the couch and spread $his buttocks. The true nature of $his new life crashes down on $him in a moment, and $he cannot decide whether to run, to rage, or to cry. You solve $his dilemma for $him by seizing $him and flinging $him toward the couch, administering practiced cracks of your palm to $his ass until $he complies. $He sobs as $he feels the burning sensation of $his @@.lime;anal virginity being taken,@@ knowing that $he can now be @@.gold;used at will@@ and is now subject to the whims of someone who has shown themselves @@.mediumorchid;willing to rape $his anus.@@
-=======
 				You stand up, your <<if $PC.dick != 0>>erection<<if $PC.vagina != -1>> and the pussy beneath it<</if>><<else>>strap-on<</if>> suddenly becoming visible to $him, and order $him in a conversational tone of voice to <<if hasAnyLegs($activeSlave)>>kneel<<else>>get<</if>> on the couch and spread $his buttocks. The true nature of $his new life crashes down on $him in a moment, and $he cannot decide whether to run, to rage, or to cry. You solve $his dilemma for $him by seizing $him and flinging $him toward the couch, administering practiced cracks of your palm to $his ass until $he complies. $He sobs as $he feels the burning sensation of $his @@.lime;anal virginity being taken,@@ knowing that $he can now be @@.gold;used at will@@ and is now subject to the whims of someone who has shown themselves @@.mediumorchid;willing to rape $his anus.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<</replace>>
 			<<set $activeSlave.devotion -= 5>>
 			<<set $activeSlave.trust -= 5>>
@@ -932,11 +904,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 	<<if canDoAnal($activeSlave)>>
 		<<link "Make sure $he enjoys $his first butt stuff">>
 			<<replace "#introResult">>
-<<<<<<< HEAD
-				You make no direct answer to $his nervous question about $his virgin butt, though you do wonder how $he was so selfish as to be a Free Cities party $girl without giving up $his asshole nightly. Instead, you ask $him about $himself, ensuring that $he learns the proper way to answer questions from $his <<= WrittenMaster($activeSlave)>>. $He answers readily, even when you turn the subject to $his sexual experiences, and $he starts to get visibly aroused. Before long, $he finds $himself sitting on your lap on the couch, making out with you while $he gives you a handjob. $He stiffens a little when you begin to play with $his butthole, but you take your time. Soon $he's taking a finger, and then two, and before long, $he's riding <<if $PC.dick >= 1>>your cock<<else>>a strap-on<</if>>. $He doesn't climax to $his @@.lime;first buttsex,@@ but $he is learning to @@.mediumaquamarine;trust@@ that you won't hurt $him.
-=======
 				You make no direct answer to $his nervous question about $his virgin butt, though you do wonder how $he was so selfish as to be a Free Cities party $girl without giving up $his asshole nightly. Instead, you ask $him about $himself, ensuring that $he learns the proper way to answer questions from $his <<= WrittenMaster($activeSlave)>>. $He answers readily, even when you turn the subject to $his sexual experiences, and $he starts to get visibly aroused. Before long, $he finds $himself sitting on your lap on the couch, making out with you while $he gives you a handjob. $He stiffens a little when you begin to play with $his butthole, but you take your time. Soon $he's taking a finger, and then two, and before long, $he's riding <<if $PC.dick != 0>>your cock<<else>>a strap-on<</if>>. $He doesn't climax to $his @@.lime;first buttsex,@@ but $he is learning to @@.mediumaquamarine;trust@@ that you won't hurt $him.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<</replace>>
 			<<set $activeSlave.trust += 10>>
 			<<set $activeSlave.anus = 1>>
@@ -950,11 +918,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 	<<if canDoAnal($activeSlave)>>
 		<<link "Make sure $he enjoys $his first anal sex">>
 			<<replace "#introResult">>
-<<<<<<< HEAD
-				You introduce $him to obedience and proper manners regarding $his <<= WrittenMaster($activeSlave)>> before sending $him off for a physical. That night, $he's returned to your room, and finds you doing business on a tablet in bed. $He looks doubtful, but obeys when you direct $him to get into bed<<if $PC.dick == 0>>, even after $he realizes you're wearing a strap-on<</if>>. You turn out the light and spoon $him from behind, kissing $his neck and ears, cupping $his swollen breasts, and running your hands across $his pregnant belly with its taut $activeSlave.skin skin. $He's awkward at first but $his body responds to the tenderness. Before long $he's humping $his pussy back and forth against <<if $PC.dick >= 1>>your cock<<else>>the strap-on<</if>>. You tell $him no, not there, and begin to gently work <<if $PC.dick >= 1>>your dickhead<<else>>its tip<</if>> up $his tight but relaxed ass. $He's unsure of $himself, but you keep $him nice and relaxed. $He doesn't climax to $his @@.lime;first buttsex,@@ but $he is learning to @@.mediumaquamarine;trust@@ that you won't hurt $him.
-=======
 				You introduce $him to obedience and proper manners regarding $his <<= WrittenMaster($activeSlave)>> before sending $him off for a physical. That night, $he's returned to your room, and finds you doing business on a tablet in bed. $He looks doubtful, but obeys when you direct $him to get into bed<<if $PC.dick == 0>>, even after $he realizes you're wearing a strap-on<</if>>. You turn out the light and spoon $him from behind, kissing $his neck and ears, cupping $his swollen breasts, and running your hands across $his pregnant belly with its taut $activeSlave.skin skin. $He's awkward at first but $his body responds to the tenderness. Before long $he's humping $his pussy back and forth against <<if $PC.dick != 0>>your cock<<else>>the strap-on<</if>>. You tell $him no, not there, and begin to gently work <<if $PC.dick != 0>>your dickhead<<else>>its tip<</if>> up $his tight but relaxed ass. $He's unsure of $himself, but you keep $him nice and relaxed. $He doesn't climax to $his @@.lime;first buttsex,@@ but $he is learning to @@.mediumaquamarine;trust@@ that you won't hurt $him.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<</replace>>
 			<<set $activeSlave.trust += 10>>
 			<<set $activeSlave.anus = 1>>
@@ -1375,11 +1339,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;
 	<<link "Threaten $his pregnancy">>
 		<<replace "#introResult">>
-<<<<<<< HEAD
-			You place an innocuous-looking drug injector on your desk, and let $him <<if !canSee($activeSlave)>>blindly <</if>>stare at it for a long moment. Then, you roll the cylinder slowly across the smooth surface, rotating it until its label comes into $his view. It depicts the silhouette of a pregnant woman, with a red "X" over it. Abortifacients. After an <<if !canSee($activeSlave)>>short period<<else>>instant<</if>> of horrified comprehension, $he flings $himself at your feet, crying, begging, promising. $He pledges to @@.hotpink;submit to you,@@ <<if $PC.dick >= 1>><<if $PC.vagina >= 1>>eat you out, <</if>>suck your cock, take it in $his pussy, take it up $his ass<<else>>eat you out, worship you with $his pussy, serve you with $his ass<</if>>, anything, as long as @@.gold;you don't hurt $his baby.@@ You observe that $he'll do all of those things, regardless of what you decide to do about $his pregnancy, but for now, you'll keep $him as a pregnant slut. $He thanks you through $his tears.
-=======
 			You place an innocuous-looking drug injector on your desk, and let $him <<if !canSee($activeSlave)>>blindly <</if>>stare at it for a long moment. Then, you roll the cylinder slowly across the smooth surface, rotating it until its label comes into <<if canSee($activeSlave)>>$his<<else>>your<</if>> view. It depicts the silhouette of a pregnant woman, with a red "X" over it. Abortifacients. After an <<if !canSee($activeSlave)>>short period<<else>>instant<</if>> of horrified comprehension, $he flings $himself at your feet, crying, begging, promising. $He pledges to @@.hotpink;submit to you,@@ <<if $PC.dick != 0>><<if $PC.vagina != -1>>eat you out, <</if>>suck your cock, take it in $his pussy, take it up $his ass<<else>>eat you out, worship you with $his pussy, serve you with $his ass<</if>>, anything, as long as @@.gold;you don't hurt $his baby.@@ You observe that $he'll do all of those things, regardless of what you decide to do about $his pregnancy, but for now, you'll keep $him as a pregnant slut. $He thanks you through $his tears.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<</replace>>
 		<<set $activeSlave.devotion += 10>>
 		<<set $activeSlave.trust -= 10>>
@@ -1591,11 +1551,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 					<<else>>
 						$he climaxes, $his impregnation fetish forcing $him to feel pleasure $his mind would prefer to reject.
 					<</if>>
-<<<<<<< HEAD
-					As you let $him go, $he cries openly, <<if $PC.dick >= 1>>your<<else>>the fake<</if>> cum dripping out of $him, and $he @@.hotpink;feels like your property.@@
-=======
 					As you let $him go, $he cries openly, <<if $PC.dick != 0>>your<<else>>the fake<</if>> cum dripping out of $him, and $he @@.hotpink;feels like your property.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					<<set $activeSlave.devotion += 4>>
 				<<else>>
 					$he groans and struggles a little, disgusted to be filled by your fluids so immediately. <<if $activeSlave.fetishKnown == 0>>It seems $he<<else>>$He<</if>> isn't an impregnation fetishist, and is @@.gold;afraid@@ that $he'll be treated as nothing more than your receptacle.
@@ -1608,11 +1564,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 <</if>>
 
 <<if $seePreg != 0>>
-<<<<<<< HEAD
-	<<if isFertile($activeSlave) && $activeSlave.womb.length == 0 && $PC.dick >= 1 && $activeSlave.eggType == "human">>
-=======
 	<<if isFertile($activeSlave) && $activeSlave.womb.length == 0 && $PC.dick != 0 && $activeSlave.eggType == "human">>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		| <<link "Impregnate $him">>
 			<<replace "#introResult">>
 			You perform a careful medical examination to verify fertility, and then <<if ($activeSlave.devotion > 20) || ($activeSlave.trust < -20)>>lay the obedient $desc across your desk<<else>>restrain the resistant $desc in your office with $his ass in the air<</if>> and gently slide your hard cock <<if $activeSlave.mpreg == 1>>up $his butt<<else>>inside $his womanhood<</if>>. You take $him with care, enjoying $his body <<if ($activeSlave.devotion > 20) || ($activeSlave.trust < -20)>>and doing your best to give $him pleasure, too<<else>>without hurting $him<</if>>. You empty your balls inside $him, thrusting in as far as you can go as you climax. When $he feels the hot liquid jet into $him,
@@ -1773,11 +1725,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 				<<else>>
 					As a humiliation fetishist, $he gets off on the stares, blushing cutely as $he takes a fuck in public.
 				<</if>>
-<<<<<<< HEAD
-				$He follows you back inside your penthouse, leaking <<if $PC.dick >= 1>>your cum<<else>>lube<</if>>, @@.hotpink;feeling like a slut.@@
-=======
 				$He follows you back inside your penthouse, leaking <<if $PC.dick != 0>>your cum<<else>>lube<</if>>, @@.hotpink;feeling like a slut.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<set $activeSlave.devotion += 5>>
 			<<else>>
 				$He takes the fuck obediently, and does $his very best to ignore the stares. <<if $activeSlave.fetishKnown == 0>>It seems $he<<else>>$He<</if>> isn't a humiliation fetishist, but $he is @@.hotpink;willing to submit@@ to being used as a sex slave in public.
@@ -1791,11 +1739,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 				<<else>>
 					As a humiliation fetishist, $he can't stop $himself from getting off on being fucked in public.
 				<</if>>
-<<<<<<< HEAD
-				As you pull $him back towards your penthouse, $he leaks <<if $PC.dick >= 1>>your cum<<else>>lube<</if>> and @@.hotpink;feels like a slut.@@
-=======
 				As you pull $him back towards your penthouse, $he leaks <<if $PC.dick != 0>>your cum<<else>>lube<</if>> and @@.hotpink;feels like a slut.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<set $activeSlave.devotion += 4>>
 			<<else>>
 				$He takes the fuck unwillingly, crying and doing $his best to ignore the stares. <<if $activeSlave.fetishKnown == 0>>It seems $he<<else>>$He<</if>> isn't a humiliation fetishist, and is @@.gold;rapidly learning what it means@@ to be your sex slave.
@@ -1813,11 +1757,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 	<<link "Give $him a chance to impress">>
 		<<replace "#introResult">>
 			<<set _num = random(1,100)>>
-<<<<<<< HEAD
-			$He seems reasonably obedient, so you give $him a chance to impress. You remain seated and offer $him your <<if $PC.dick >= 1>>half-erect cock<<if $PC.vagina >= 1>> and ready pussy<</if>><<else>>pussy, wet with arousal at the prospect of breaking in a new slut<</if>>. $He comes over obediently and gets on $his knees. $He works hard and is clearly doing $his absolute best to please, so you let $him finish you with $his mouth. <<if $PC.dick >= 1>><<if _num > 20>>$He looks up at you as $he swallows<<elseif _num > 40>>$He even swallows your cum without being told<<elseif _num > 60>>$He smiles sloppily as your seed slowly dribbles from $his mouth and down $his chin<<elseif _num > 80>>$He struggles to contain your seed and makes a mess all over $his face as a result<<else>>$He struggles to contain your seed with $his mouth and it splatters over the floor as a result<</if>><<else>>$He worked $his tongue hard and did $his best<</if>>. You spend the rest of the day with $him kneeling on a cushion next to your chair. $He learns obedience, but also learns that you are @@.mediumaquamarine;fair@@ and @@.hotpink;reasonable.@@
-=======
 			$He seems reasonably obedient, so you give $him a chance to impress. You remain seated and offer $him your <<if $PC.dick != 0>>half-erect cock<<if $PC.vagina != -1>> and ready pussy<</if>><<else>>pussy, wet with arousal at the prospect of breaking in a new slut<</if>>. $He comes over obediently and gets on $his knees. $He works hard and is clearly doing $his absolute best to please, so you let $him finish you with $his mouth. <<if $PC.dick != 0>><<if _num > 20>>$He looks up at you as $he swallows<<elseif _num > 40>>$He even swallows your cum without being told<<elseif _num > 60>>$He smiles sloppily as your seed slowly dribbles from $his mouth and down $his chin<<elseif _num > 80>>$He struggles to contain your seed and makes a mess all over $his face as a result<<else>>$He struggles to contain your seed with $his mouth and it splatters over the floor as a result<</if>><<else>>$He worked $his tongue hard and did $his best<</if>>. You spend the rest of the day with $him kneeling on a cushion next to your chair. $He learns obedience, but also learns that you are @@.mediumaquamarine;fair@@ and @@.hotpink;reasonable.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<</replace>>
 		<<set $activeSlave.devotion += 4>>
 		<<set $activeSlave.trust += 4>>
@@ -1960,21 +1900,12 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 						small, milk laden breasts.
 					<<elseif $PC.boobs >= 300>>
 						tiny, milk laden breasts.
-<<<<<<< HEAD
-					<<elseif $PC.boobs >= 1>>
-						big, milk laden breasts.
-=======
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					<<else>>
 						milk swollen chest.
 					<</if>>
 					$He tries to squirm away from the moist spot growing under $his cheek, but you reveal your nipple and carefully direct $his mouth over it.
 					<<if $activeSlave.fetish == "pregnancy">>
-<<<<<<< HEAD
-						Slowly $he begins to suckle from your swollen breast. You gently brush $his head as you try to hold back your pleasure — a wasted effort, as a hand sneaks its way to your <<if $PC.dick >= 1>>growing erection and enthusiastically begins pumping away<<else>>wet pussy and enthusiastically begins rubbing your clit<</if>>. You clutch your pervy $girl closer to you as $he caresses your pregnancy with one hand and gets you off with the other. Before long you find yourself bucking your hips with lust, a queue for you to release $him from your nipple so $he may slide down your gravid dome of a belly to finish you off. Happy to serve $his pregnant <<= WrittenMaster($activeSlave)>>, $he returns to your chest, happy to relieve you of the pressure building in your neglected breast. <<if $activeSlave.fetishKnown == 0>>Judging by that show, @@.green;$he savors getting to be with a pregnant _womanP.@@<<set $activeSlave.fetishKnown = 1>><<else>>You knew $he had a pregnancy fetish and $his eagerness to serve a pregnant _womanP proves that.<</if>> A kick from within startles you from your thoughts; as you reach to soothe your child<<if $PC.pregType > 1>>ren<</if>>, you find your new slave @@.mediumaquamarine;already doting on them.@@ $He's already starting to @@.hotpink;show understanding of $his place.@@
-=======
 						Slowly $he begins to suckle from your swollen breast. You gently brush $his head as you try to hold back your pleasure — a wasted effort, as a hand sneaks its way to your <<if $PC.dick != 0>>growing erection and enthusiastically begins pumping away<<else>>wet pussy and enthusiastically begins rubbing your clit<</if>>. You clutch your pervy $girl closer to you as $he caresses your pregnancy with one hand and gets you off with the other. Before long you find yourself bucking your hips with lust, a queue for you to release $him from your nipple so $he may slide down your gravid dome of a belly to finish you off. Happy to serve $his pregnant <<= WrittenMaster($activeSlave)>>, $he returns to your chest, happy to relieve you of the pressure building in your neglected breast. <<if $activeSlave.fetishKnown == 0>>Judging by that show, @@.green;$he savors getting to be with a pregnant _womanP.@@<<set $activeSlave.fetishKnown = 1>><<else>>You knew $he had a pregnancy fetish and $his eagerness to serve a pregnant _womanP proves that.<</if>> A kick from within startles you from your thoughts; as you reach to soothe your child<<if $PC.pregType > 1>>ren<</if>>, you find your new slave @@.mediumaquamarine;already doting on them.@@ $He's already starting to @@.hotpink;show understanding of $his place.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 						<<set $activeSlave.devotion += 15, $activeSlave.trust += 15>>
 					<<elseif $activeSlave.fetish == "boobs">>
 						Eagerly $he begins to suckle from your swollen breast. You gently brush $his head as you try to hold back your pleasure — a wasted effort, as a hand sneaks its way to your neglected breast. $He massages it, careful not to encourage your lactation too much, as $he greedily sucks you dry. $He wastes no time in swapping to your other nipple, shifting $his ministrations to the one the just left. By the time your reserves are tapped out, both you and $he are quite content. You permit $him to rest against your chest for a little before you send $him on $his way. <<if $activeSlave.fetishKnown == 0>>Judging by $his enthusiasm, @@.green;$he savors getting $his mouth close to a pair of boobs.@@<<set $activeSlave.fetishKnown = 1>><<else>>You knew $he had a breast fetishist and $his eagerness to lighten a lactating _womanP proves that.<</if>> A kick from within startles you from your thoughts; you pat your gravid middle, reassuring your child<<if $PC.pregType > 1>>ren<</if>> that you'll make sure to save some milk for them. $He's already starting to @@.hotpink;show understanding of $his place@@ and even @@.mediumaquamarine;beginning to build trust@@ with you.
@@ -2293,11 +2224,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 				<<set $activeSlave.counter.anal += 10, $analTotal += 10>>
 				<<= assignJob($activeSlave, "dairy")>>
 				<<replace "#introResult">>
-<<<<<<< HEAD
-					Making use of <<if ($activeSlave.trust < -20) || ($activeSlave.devotion > 20)>>$his obedience<<else>>the compliance systems<</if>>, you restrain $him on one of the chairs in your office in an approximation of the position $he'll occupy in $dairyName. Then you put a mask on $him, like the ones the machines there feature, and turn it on, watching the slave squirm against $his restraints under the sudden bombardment of garish hardcore porn. Finally, you add a dildo gag, both to mimic the dildo that will feed $him, and to keep your office reasonably quiet. Then, for the rest of the day, you use $his vulnerable <<if $activeSlave.vagina > -1>>holes<<else>>asshole<</if>> as an outlet for your sexual energy. You are not gentle; in fact, the point of the whole exercise is to gape $him. By the evening $he's been fucked so hard that $he's stopped jerking against the chair when you pound <<if $PC.dick >= 1>>your huge cock<<else>>a huge strap-on<</if>> in and out of $him, so you're obliged to get creative, sliding fingers in alongside <<if $PC.dick >= 1>>yourself<<else>>it<</if>> to really blow $him out. Once that gets too easy, you start adding dildos for double <<if $activeSlave.vagina > -1>>and triple <</if>>penetration. By nighttime $he's properly prepared to take $dairyName's giant phalli, and you're bored, so you consign $him to $his fate. $He might have some opinion on how $he's spent $his day, but it's unlikely $he'll remember it by tomorrow, what with the forearm-sized dildos sliding in and out of $his throat<<if $activeSlave.vagina > -1>>, cunt,<</if>> and asshole.
-=======
 					Making use of <<if ($activeSlave.trust < -20) || ($activeSlave.devotion > 20)>>$his obedience<<else>>the compliance systems<</if>>, you restrain $him on one of the chairs in your office in an approximation of the position $he'll occupy in $dairyName. Then you put a mask on $him, like the ones the machines there feature, and turn it on, watching the slave squirm against $his restraints under the sudden bombardment of garish hardcore porn. Finally, you add a dildo gag, both to mimic the dildo that will feed $him, and to keep your office reasonably quiet. Then, for the rest of the day, you use $his vulnerable <<if $activeSlave.vagina > -1>>holes<<else>>asshole<</if>> as an outlet for your sexual energy. You are not gentle; in fact, the point of the whole exercise is to gape $him. By the evening $he's been fucked so hard that $he's stopped jerking against the chair when you pound <<if $PC.dick != 0>>your huge cock<<else>>a huge strap-on<</if>> in and out of $him, so you're obliged to get creative, sliding fingers in alongside <<if $PC.dick != 0>>yourself<<else>>it<</if>> to really blow $him out. Once that gets too easy, you start adding dildos for double <<if $activeSlave.vagina > -1>>and triple <</if>>penetration. By nighttime $he's properly prepared to take $dairyName's giant phalli, and you're bored, so you consign $him to $his fate. $He might have some opinion on how $he's spent $his day, but it's unlikely $he'll remember it by tomorrow, what with the forearm-sized dildos sliding in and out of $his throat<<if $activeSlave.vagina > -1>>, cunt,<</if>> and asshole.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<</replace>>
 			<</link>>
 		<</if>>
diff --git a/src/uncategorized/pHostageAcquisition.tw b/src/uncategorized/pHostageAcquisition.tw
index e0246c776e0a5f1f99680f7d4282074e37befd43..ba79a11e8554bbcd2e7bce899d422202951e5bd1 100644
--- a/src/uncategorized/pHostageAcquisition.tw
+++ b/src/uncategorized/pHostageAcquisition.tw
@@ -58,15 +58,9 @@ Your hired mercenaries are en route now with your precious cargo.
 	<</if>>
 	<<set $activeSlave.health = 50>>
 	<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "They kept trying to rape me with $arcologies[0].FSSubjugationistRace <<s>>lave<<s>>!" You gently wrap your arms around $him in a comforting embrace. $He's nearly the same as you remember $him, albeit a bit more hateful towards $arcologies[0].FSSubjugationistRace people.
-	<<elseif $rivalryDuration <= 10>>
-		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They raped me with $arcologies[0].FSSubjugationistRace <<s>>lave<<s>>!" $He's nearly the same as you remember $him, albeit with a slight $arcologies[0].FSSubjugationistRace fetish.
-=======
 		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "They kept trying to rape me with $arcologies[0].FSSubjugationistRace <<s>>lave<<s>>!" You gently wrap your arms around $him in a comforting embrace. $He's nearly the same as you remember $him, albeit a bit more hateful towards $arcologies[0].FSSubjugationistRace people.
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They raped me with $arcologies[0].FSSubjugationistRace <<s>>lave<<s>>!" $He's nearly the same as you remember $him, albeit with a slight $arcologies[0].FSSubjugationistRace fetish.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<elseif $rivalryDuration <= 15>>
 		Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth, unsure of what to make of you. As you step forward, $he hesitatingly approaches. Once $he is close enough $he asks "Can I <<s>>pend <<s>>ome time with the $arcologies[0].FSSubjugationistRace <<s>>lave<<s>>?" While $he looks the same as you remember, $he certainly doesn't think the same anymore.
 	<<elseif $rivalryDuration <= 20>>
@@ -126,15 +120,9 @@ Your hired mercenaries are en route now with your precious cargo.
 	<<set $activeSlave.health = 50>>
 	<<set WombFlush($activeSlave)>>
 	<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "They took my egg<<s>> away!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember, though a medical scan reveals that $his ovaries contain absolutely zero egg cells.
-	<<elseif $rivalryDuration <= 10>>
-		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They took my fertility away!" $He's exactly as you remember, though a medical scan reveals that $his ovaries contain absolutely zero egg cells.
-=======
 		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "They took my egg<<s>> away!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember, though a medical scan reveals that $his ovaries contain absolutely zero egg cells.
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They took my fertility away!" $He's exactly as you remember, though a medical scan reveals that $his ovaries contain absolutely zero egg cells.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<elseif $rivalryDuration <= 15>>
 		Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth, unsure of what to make of you. As you step forward, $he hesitatingly approaches. Once $he is close enough $he says "You don't have to worry about knocking me up, I'm <<s>>terile!" with a wink. While $he looks the same as you remember, $he certainly doesn't think the same anymore.
 	<<elseif $rivalryDuration <= 20>>
@@ -149,15 +137,9 @@ Your hired mercenaries are en route now with your precious cargo.
 	<<set $activeSlave.health = 50>>
 	<<if $seeHyperPreg != 1>>
 		<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-			Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "They filled me with cum! I think I'm pregnant!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember, though a medical scan reveals that $he is carrying <<print pregNumberName($activeSlave.pregType, 2)>>.
-		<<elseif $rivalryDuration <= 10>>
-			Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears, $his rounded middle pressing into your own. "They knocked me up!" $He's exactly as you remember, though a medical scan reveals that $he is carrying <<print pregNumberName($activeSlave.pregType, 2)>>.
-=======
 			Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "They filled me with cum! I think I'm pregnant!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember, though a medical scan reveals that $he is carrying <<print pregNumberName($activeSlave.pregType, 2)>>.
 		<<elseif $rivalryDuration <= 10>>
 			Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears, $his rounded middle pressing into your own. "They knocked me up!" $He's exactly as you remember, though a medical scan reveals that $he is carrying <<print pregNumberName($activeSlave.pregType, 2)>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<elseif $rivalryDuration <= 15>>
 			Upon seeing you, $activeSlave.slaveName shifts $his gravid bulk back and forth, unsure of what to make of you. As you step forward, $he hesitatingly approaches. Once $he is close enough $he says "Plea<<s>>e don't take them from me, I love them..." While $he looks the same as you remember, albeit rather pregnant, $he certainly doesn't think the same anymore.
 		<<elseif $rivalryDuration <= 20>>
@@ -170,15 +152,9 @@ Your hired mercenaries are en route now with your precious cargo.
 		<</if>>
 	<<else>>
 		<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-			Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "They filled me with cum! I think I'm pregnant!" You gently wrap your arms around $him in a comforting embrace, yet you can't help but notice how distended $his belly is. $He's exactly as you remember, maybe a little heftier, but a medical scan reveals, horrifyingly, that $he is carrying over two dozen babies in $his womb.
-		<<elseif $rivalryDuration <= 10>>
-			Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You try to pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>>, but $his huge pregnant belly prevents you. As $he breaks down in tears, $he moans "My womb is <<s>>oo full..." $He's nearly the same as you remember $him, save for $his huge pregnant belly, which a medical scan reveals contains over two dozen children.
-=======
 			Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "They filled me with cum! I think I'm pregnant!" You gently wrap your arms around $him in a comforting embrace, yet you can't help but notice how distended $his belly is. $He's exactly as you remember, maybe a little heftier, but a medical scan reveals, horrifyingly, that $he is carrying over two dozen babies in $his womb.
 		<<elseif $rivalryDuration <= 10>>
 			Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You try to pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>>, but $his huge pregnant belly prevents you. As $he breaks down in tears, $he moans "My womb is <<s>>oo full..." $He's nearly the same as you remember $him, save for $his huge pregnant belly, which a medical scan reveals contains over two dozen children.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<elseif $rivalryDuration <= 15>>
 			Upon seeing you, $activeSlave.slaveName shifts $his super gravid bulk back and forth, unsure of what to make of you. As you step forward, $he hesitatingly approaches. Once $he is close enough for $his monstrous belly to bump into your own, $he says "It feel<<s>> so good to be <<s>>tuffed completely full of life. You'll let me enjoy thi<<s>>, won't you?" While $he looks the same as you remember, albeit grossly pregnant, $he certainly doesn't think the same anymore. A medical exam, much to $his enjoyment, reveals $his overfilled womb contains nearly two dozen children.
 		<<elseif $rivalryDuration <= 20>>
@@ -193,15 +169,9 @@ Your hired mercenaries are en route now with your precious cargo.
 <<case "Gender Radicalism">>
 	<<set $activeSlave.health = 60>>
 	<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "They acted <<s>>o weird!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember, if not slightly more attached to you.
-	<<elseif $rivalryDuration <= 10>>
-		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "Will you be a<<s>> kind to me a<<s>> they were?" $He's exactly as you remember, if not slightly more attached to you.
-=======
 		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "They acted <<s>>o weird!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember, if not slightly more attached to you.
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "Will you be a<<s>> kind to me a<<s>> they were?" $He's exactly as you remember, if not slightly more attached to you.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<elseif $rivalryDuration <= 15>>
 		Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth, unsure of what to make of you. As you step forward, $he hesitatingly approaches. Once $he is close enough $he asks "Will you love me too?" While $he looks the same as you remember, $he certainly doesn't think the same anymore.
 	<<elseif $rivalryDuration <= 20>>
@@ -215,15 +185,9 @@ Your hired mercenaries are en route now with your precious cargo.
 <<case "Gender Fundamentalism">>
 	<<set $activeSlave.health = 20>>
 	<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "They did <<s>>uch terrible thing<<s>> to my butt!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember, if not a little curious about anal.
-	<<elseif $rivalryDuration <= 10>>
-		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They broke my butthole!" $He's exactly as you remember, minus $his loose rear.
-=======
 		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "They did <<s>>uch terrible thing<<s>> to my butt!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember, if not a little curious about anal.
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They broke my butthole!" $He's exactly as you remember, minus $his loose rear.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<elseif $rivalryDuration <= 15>>
 		Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth, unsure of what to make of you. As you step forward, $he hesitatingly approaches. Once $he is close enough $he says "Do you want to fuck my butt?<<if $seeDicks != 0>> Maybe touch my peni<<s>>?<</if>>" While $he looks the same as you remember, minus $his very loose butthole<<if $seeDicks != 0>> and minuscule dick<</if>>, $he certainly doesn't think the same anymore.
 	<<elseif $rivalryDuration <= 20>>
@@ -237,37 +201,21 @@ Your hired mercenaries are en route now with your precious cargo.
 	<</if>>
 <<case "Paternalism">>
 	<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "Thank you... Thank you..." You gently wrap your arms around $him in a comforting embrace. $He's nearly the same as you remember $him, albeit acting slightly odd and covered in piercings and tattoos.
-		<<set $activeSlave.weight = 0>>
-		<<if $activeSlave.health > -20>><<set $activeSlave.health = -20>><</if>>
-	<<elseif $rivalryDuration <= 10>>
-		Upon seeing you, $activeSlave.slaveName tries to crawl to you. You help $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he sobs "T-thank you... T-thank you..." You gently draw $his thin body into a comforting embrace. $He's nearly the same as you remember $him, albeit thinner, acting odd and covered in piercings and tattoos.
-=======
 		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "Thank you... Thank you..." You gently wrap your arms around $him in a comforting embrace. $He's nearly the same as you remember $him, albeit acting slightly odd and covered in piercings and tattoos.
 		<<set $activeSlave.weight = 0>>
 		<<if $activeSlave.health > -20>><<set $activeSlave.health = -20>><</if>>
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName tries to crawl to you. You help $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he sobs "T-thank you... T-thank you..." You gently draw $his thin body into a comforting embrace. $He's nearly the same as you remember $him, albeit thinner, acting odd and covered in piercings and tattoos.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.weight = -20>>
 		<<set $activeSlave.muscles = -20>>
 		<<if $activeSlave.health > -40>><<set $activeSlave.health = -40>><</if>>
 	<<elseif $rivalryDuration <= 15>>
-<<<<<<< HEAD
-		Upon seeing you, $activeSlave.slaveName tries to crawl to you. You help $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he sobs. You gently draw $his rail thin body into a comforting embrace, though you can't help but notice several of $his ribs are broken. $He's barely recognizable; being much thinner, acting very odd and covered in piercings and tattoos.
-=======
 		Upon seeing you, $activeSlave.slaveName tries to crawl to you. You help $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he sobs. You gently draw $his rail thin body into a comforting embrace, though you can't help but notice several of $his ribs are broken. $He's barely recognizable; being much thinner, acting very odd and covered in piercings and tattoos.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.weight = -50>>
 		<<set $activeSlave.muscles = -50>>
 		<<if $activeSlave.health > -60>><<set $activeSlave.health = -60>><</if>>
 	<<elseif $rivalryDuration <= 20>>
-<<<<<<< HEAD
-		Upon being placed in your office, $activeSlave.slaveName curls into a fetal position and begins sobbing. You help $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he pitifully struggles. You gently draw $his emaciated body into a comforting embrace and call out $his name, having realized $he is blind. $He immediately calms down and moves closer to you. $He's barely recognizable; being skin and bone, acting very odd and covered in piercings and tattoos.
-=======
 		Upon being placed in your office, $activeSlave.slaveName curls into a fetal position and begins sobbing. You help $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he pitifully struggles. You gently draw $his emaciated body into a comforting embrace and call out $his name, having realized $he is blind. $He immediately calms down and moves closer to you. $He's barely recognizable; being skin and bone, acting very odd and covered in piercings and tattoos.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.weight = -100>>
 		<<set $activeSlave.muscles = -80>>
 		<<if $activeSlave.health > -80>><<set $activeSlave.health = -80>><</if>>
@@ -313,15 +261,9 @@ Your hired mercenaries are en route now with your precious cargo.
 <<case "Transformation Fetishism">>
 	<<set $activeSlave.health = 60>>
 	<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "They told me <<s>>uch horrible thing<<s>> about you!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
-	<<elseif $rivalryDuration <= 10>>
-		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "You aren't going to for<<c>>e implant<<s>> into me, are you?" While $he looks the same as you remember, $he certainly doesn't think the same anymore.
-=======
 		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "They told me <<s>>uch horrible thing<<s>> about you!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "You aren't going to for<<c>>e implant<<s>> into me, are you?" While $he looks the same as you remember, $he certainly doesn't think the same anymore.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<elseif $rivalryDuration <= 15>>
 		Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth, unsure of what to make of you. As you step forward, $he hesitatingly approaches. Once $he is close enough $he states "Plea<<s>>e don't make me into a blow up doll..." While $he looks the same as you remember, $he certainly doesn't think the same anymore.
 	<<elseif $rivalryDuration <= 20>>
@@ -335,15 +277,9 @@ Your hired mercenaries are en route now with your precious cargo.
 <<case "Youth Preferentialism">>
 	<<set $activeSlave.health = 60>>
 	<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "Thi<<s>> old woman tried to make me her pet!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
-	<<elseif $rivalryDuration <= 10>>
-		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They made me make out with an old lady!" $He's exactly as you remember.
-=======
 		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "Thi<<s>> old woman tried to make me her pet!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They made me make out with an old lady!" $He's exactly as you remember.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<elseif $rivalryDuration <= 15>>
 		Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth, unsure of what to make of you. As you step forward, $he hesitatingly approaches. Once $he is close enough $he asks "<<if $PC.visualAge >= 50>>Were you alway<<s>> that attractive?<<else>>Can I hang out with some MILF<<s>>?<</if>>" While $he looks the same as you remember, $he certainly doesn't think the same anymore.
 	<<elseif $rivalryDuration <= 20>>
@@ -358,15 +294,9 @@ Your hired mercenaries are en route now with your precious cargo.
 <<case "Maturity Preferentialism">>
 	<<set $activeSlave.health = 60>>
 	<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "Thi<<s>> young girl kept mole<<s>>ting me!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
-	<<elseif $rivalryDuration <= 10>>
-		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They made me make out with <<s>>ome young harlot!" $He's exactly as you remember.
-=======
 		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "Thi<<s>> young girl kept mole<<s>>ting me!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They made me make out with <<s>>ome young harlot!" $He's exactly as you remember.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<elseif $rivalryDuration <= 15>>
 		Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth, unsure of what to make of you. As you step forward, $he hesitatingly approaches. Once $he is close enough $he asks "<<if $PC.visualAge < 35>>Were you alway<<s>> that attractive?<<else>>Can I hang out with the re<<s>>t of the young ladie<<s>>?<</if>>" While $he looks the same as you remember, $he certainly doesn't think the same anymore.
 	<<elseif $rivalryDuration <= 20>>
@@ -398,15 +328,9 @@ Your hired mercenaries are en route now with your precious cargo.
 <<case "Asset Expansionism">>
 	<<set $activeSlave.health = 60>>
 	<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "They told me <<s>>uch horrible thing<<s>> about you!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
-	<<elseif $rivalryDuration <= 10>>
-		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "You aren't going to make my tit<<s>> huge, are you?" While $he looks the same as you remember, $he certainly doesn't think the same anymore.
-=======
 		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "They told me <<s>>uch horrible thing<<s>> about you!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "You aren't going to make my tit<<s>> huge, are you?" While $he looks the same as you remember, $he certainly doesn't think the same anymore.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<elseif $rivalryDuration <= 15>>
 		Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth, unsure of what to make of you. As you step forward, $he hesitatingly approaches. Once $he is close enough $he pleads "Plea<<s>>e don't turn me into a big boobed freak..." While $he looks the same as you remember, $he certainly doesn't think the same anymore.
 	<<elseif $rivalryDuration <= 20>>
@@ -436,15 +360,9 @@ Your hired mercenaries are en route now with your precious cargo.
 <<case "Cummunism">>
 	<<set $activeSlave.health = -30>>
 	<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-		Upon seeing you, $activeSlave.slaveName attempts to dive into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>>. The weight of $his huge <<print $activeSlave.boobs>>cc tits knocks the wind out of you. You embrace $him as best you can, you hands sinking into $his soft butt, as $he sobs "They made me fat! My nipple<<s>> won't <<s>>top leaking milk!" $He looks similar to how you remember, minus $his huge milky assets of course.
-	<<elseif $rivalryDuration <= 10>>
-		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $his massive <<print $activeSlave.boobs>>cc milky breasts into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "Why did they make me into a cow, I don't under<<s>>tand..." $He looks similar to how you remember, minus $his massive assets of course.
-=======
 		Upon seeing you, $activeSlave.slaveName attempts to dive into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>>. The weight of $his huge <<print $activeSlave.boobs>>cc tits knocks the wind out of you. You embrace $him as best you can, you hands sinking into $his soft butt, as $he sobs "They made me fat! My nipple<<s>> won't <<s>>top leaking milk!" $He looks similar to how you remember, minus $his huge milky assets of course.
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $his massive <<print $activeSlave.boobs>>cc milky breasts into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "Why did they make me into a cow, I don't under<<s>>tand..." $He looks similar to how you remember, minus $his massive assets of course.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<elseif $rivalryDuration <= 15>>
 		$activeSlave.slaveName's impressive bulk is placed in your office. Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth atop $his <<print $activeSlave.boobs>>cc breasts, causing $his chubby body and fat ass to jiggle, unsure of what to make of you. As you step forward, $he asks "Can you milk me?" The $girl you used to know is barely recognizable under all that fat and $he certainly doesn't think the same anymore.
 	<<elseif $rivalryDuration <= 20>>
@@ -479,15 +397,9 @@ Your hired mercenaries are en route now with your precious cargo.
 <<case "Hedonistic Decadence">>
 	<<set $activeSlave.health = 60>>
 	<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "I've never had to e<<x>>er<<c>>i<<s>>e <<s>>o much, I'm exhau<<s>>ted!" You gently wrap your arms around $his soft body in a comforting embrace. $He's exactly as you remember.
-	<<elseif $rivalryDuration <= 10>>
-		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>>, feeling the muscles under $his chubby body, as $he breaks down in tears. "You aren't going to make me pump iron, are you?" While $he's thinner than you remember, and a little more muscular, $his personality is exactly the same.
-=======
 		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "I've never had to e<<x>>er<<c>>i<<s>>e <<s>>o much, I'm exhau<<s>>ted!" You gently wrap your arms around $his soft body in a comforting embrace. $He's exactly as you remember.
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>>, feeling the muscles under $his chubby body, as $he breaks down in tears. "You aren't going to make me pump iron, are you?" While $he's thinner than you remember, and a little more muscular, $his personality is exactly the same.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<elseif $rivalryDuration <= 15>>
 		Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth, unsure of what to make of you. As you step forward, $he hesitatingly approaches. Once $he is close enough $he says "I don't want to ever be <<s>>o heavy again..." $He is noticeably thinner and much more muscular than you remember; $he certainly doesn't think the same anymore, either.
 	<<elseif $rivalryDuration <= 20>>
@@ -501,15 +413,9 @@ Your hired mercenaries are en route now with your precious cargo.
 <<case "Chattel Religionism">>
 	<<set $activeSlave.health = 50>>
 	<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "They told me <<s>>uch horrible thing<<s>> about you!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
-	<<elseif $rivalryDuration <= 10>>
-		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "You aren't trying to make <<s>>ome cra<<z>>y religion, are you?" While $he looks the same as you remember, $he certainly doesn't think the same anymore.
-=======
 		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "They told me <<s>>uch horrible thing<<s>> about you!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "You aren't trying to make <<s>>ome cra<<z>>y religion, are you?" While $he looks the same as you remember, $he certainly doesn't think the same anymore.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<elseif $rivalryDuration <= 15>>
 		Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth, unsure of what to make of you. As you step forward, $he hesitatingly approaches. Once $he is close enough $he pleads "Plea<<s>>e don't turn me into a di<<sc>>iple of your religion..." While $he looks the same as you remember, $he certainly doesn't think the same anymore.
 	<<elseif $rivalryDuration <= 20>>
@@ -540,15 +446,9 @@ Your hired mercenaries are en route now with your precious cargo.
 <<case "Intellectual Dependency">>
 	<<set $activeSlave.health = 80>>
 	<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "They tried to teach me the mo<<s>>t ob<<sc>>ene thing<<s>>!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
-	<<elseif $rivalryDuration <= 10>>
-		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They made me a whore. I feel <<s>>o di<<s>>gu<<s>>ting..." $He's exactly as you remember.
-=======
 		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "They tried to teach me the mo<<s>>t ob<<sc>>ene thing<<s>>!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They made me a whore. I feel <<s>>o di<<s>>gu<<s>>ting..." $He's exactly as you remember.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<elseif $rivalryDuration <= 15>>
 		<<set $activeSlave.devotion = 40>>
 		<<set $activeSlave.trust = 40>>
@@ -579,15 +479,9 @@ Your hired mercenaries are en route now with your precious cargo.
 <<case "Petite Admiration">>
 	<<set $activeSlave.health = 60>>
 	<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "Thi<<s>> giant woman tried to make me her pet!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
-	<<elseif $rivalryDuration <= 10>>
-		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They made me make out with a giant!" $He's exactly as you remember.
-=======
 		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "Thi<<s>> giant woman tried to make me her pet!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They made me make out with a giant!" $He's exactly as you remember.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<elseif $rivalryDuration <= 15>>
 		Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth, unsure of what to make of you. As you step forward, $he hesitatingly approaches. Once $he is close enough $he asks
 		/* player height check here */
@@ -608,11 +502,7 @@ Your hired mercenaries are en route now with your precious cargo.
 <<case "Statuesque Glorification">>
 	<<set $activeSlave.health = 60>>
 	<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "Thi<<s>> midget kept mole<<s>>ting me!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
-=======
 		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "Thi<<s>> midget kept mole<<s>>ting me!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They made me get on <<if hasBothLegs($activeSlave)>>my knee<<s>><<else>>the ground<</if>> and make out with <<s>>ome tiny harlot!" $He's exactly as you remember.
 	<<elseif $rivalryDuration <= 15>>
@@ -635,15 +525,9 @@ Your hired mercenaries are en route now with your precious cargo.
 <<default>>
 	<<set $activeSlave.health = 40>>
 	<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
-		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "They told me <<s>>uch horrible thing<<s>> about you!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
-	<<elseif $rivalryDuration <= 10>>
-		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears.
-=======
 		Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "They told me <<s>>uch horrible thing<<s>> about you!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
 	<<elseif $rivalryDuration <= 10>>
 		Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<if $rivalryFS != 0>>
 			"You aren't trying to make <<s>>ome cra<<z>>y old-timey <<s>>o<<c>>iety, are you?"
 		<<else>>
diff --git a/src/uncategorized/pRivalInitiation.tw b/src/uncategorized/pRivalInitiation.tw
index 0c78e5d712cb6c55b70ceda87ebc0bfd55ed1ac9..0477381e1ec36d284064fa0235caddfb56a1d027 100644
--- a/src/uncategorized/pRivalInitiation.tw
+++ b/src/uncategorized/pRivalInitiation.tw
@@ -41,11 +41,7 @@ This is a special week, the week of your victory. <<EventNameLink>> awaits your
 	<br><<link "Break $his ass and then let the public use it">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
-<<<<<<< HEAD
-		$activeSlave.slaveName, who has been fairly dignified up to this point, breaks down when $he's placed in stocks with $his ass in the air. $His sobs become screams when, for the first time in $his life, $he feels the burning sensation of a well-lubricated <<if $PC.dick >= 1>>cockhead<<else>>strap-on<</if>> forcing its way past $his virgin sphincter. Raping a virgin anus is not a new pleasure for you, but the usual shrieking, struggling and spasming is all the sweeter this time. @@.green;Half the arcology@@ has used $his @@.red;poor injured butthole@@ by the end of the day; $he @@.gold;is learning to fear you,@@ and hates you @@.mediumorchid;even more@@ if possible.
-=======
 		$activeSlave.slaveName, who has been fairly dignified up to this point, breaks down when $he's placed in stocks with $his ass in the air. $His sobs become screams when, for the first time in $his life, $he feels the burning sensation of a well-lubricated <<if $PC.dick != 0>>cockhead<<else>>strap-on<</if>> forcing its way past $his virgin sphincter. Raping a virgin anus is not a new pleasure for you, but the usual shrieking, struggling and spasming is all the sweeter this time. @@.green;Half the arcology@@ has used $his @@.red;poor injured butthole@@ by the end of the day; $he @@.gold;is learning to fear you,@@ and hates you @@.mediumorchid;even more@@ if possible.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.devotion -= 4, $activeSlave.trust -= 5, $activeSlave.health -= 10, $activeSlave.anus = 3, $activeSlave.counter.anal += 47, $analTotal += 47>>
 		<<run repX(2500, "event", $activeSlave)>>
 		<<if $activeSlave.counter.publicUse>><<set $activeSlave.counter.publicUse += 47>><<else>><<set $activeSlave.counter.publicUse = 47>><</if>>
diff --git a/src/uncategorized/peHeadgirlConcubine.tw b/src/uncategorized/peHeadgirlConcubine.tw
index a18d7ab7e023eee18e0af01b7625ad8974da6a58..051be39aa72de5534a2cdcac72c838546a9aeeaa 100644
--- a/src/uncategorized/peHeadgirlConcubine.tw
+++ b/src/uncategorized/peHeadgirlConcubine.tw
@@ -165,11 +165,7 @@ and it's also obvious that they've been filling the few minutes they've been wai
 	<<case "submissive">>
 		catches $his lower lip behind $his teeth and gives you a blushing, sexually submissive look
 	<<case "cumslut">>
-<<<<<<< HEAD
-		<<if $PC.dick >= 1>>focuses on your cock<<else>>looks you in the eye<</if>> and licks $his lips lasciviously
-=======
 		<<if $PC.dick != 0>>focuses on your cock<<else>>looks you in the eye<</if>> and licks $his lips lasciviously
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<case "humiliation">>
 		flashes you and blushes artfully
 	<<case "buttslut">>
@@ -289,21 +285,13 @@ and it's also obvious that they've been filling the few minutes they've been wai
 					<<else>>
 						shoves $his cock up $Concubine.slaveName's ass, since $he knows your Concubine can take $his dick with ease.
 					<</if>>
-<<<<<<< HEAD
-					<<if $PC.dick >= 1>>You feel the penetration through $Concubine.slaveName's vaginal walls, an incredible sensation.<</if>>
-=======
 					<<if $PC.dick != 0>>You feel the penetration through $Concubine.slaveName's vaginal walls, an incredible sensation.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					<<if canImpreg($slaves[_concubine], $slaves[_headGirl])>>
 						<<= knockMeUp($slaves[_concubine], 10, 1, $slaves[_headGirl].ID, 1)>>
 					<</if>>
 					<<set $slaves[_concubine].counter.anal++, $analTotal++>>
 				<<else>>
-<<<<<<< HEAD
-					gently eases $his cock in beside you.<<if $PC.dick >= 1>> The added friction against you in $Concubine.slaveName's vagina feels incredible.<</if>>
-=======
 					gently eases $his cock in beside you.<<if $PC.dick != 0>> The added friction against you in $Concubine.slaveName's vagina feels incredible.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					<<set $slaves[_concubine].counter.vaginal++, $vaginalTotal++>>
 					<<if canImpreg($slaves[_concubine], $slaves[_headGirl])>>
 						<<= knockMeUp($slaves[_concubine], 10, 0, $slaves[_headGirl].ID, 1)>>
@@ -322,17 +310,10 @@ and it's also obvious that they've been filling the few minutes they've been wai
 					<<else>>
 						starts to fuck $Concubine.slaveName's tight little backdoor with a finger.
 					<</if>>
-<<<<<<< HEAD
-					<<if $PC.dick >= 1>>You feel the penetration through $Concubine.slaveName's vaginal walls, an incredible sensation.<</if>>
-					<<set $slaves[_concubine].counter.anal++, $analTotal++>>
-				<<else>>
-					gently eases a few fingers in beside you.<<if $PC.dick >= 1>> The added sensation in $Concubine.slaveName's vagina feels incredible.<</if>>
-=======
 					<<if $PC.dick != 0>>You feel the penetration through $Concubine.slaveName's vaginal walls, an incredible sensation.<</if>>
 					<<set $slaves[_concubine].counter.anal++, $analTotal++>>
 				<<else>>
 					gently eases a few fingers in beside you.<<if $PC.dick != 0>> The added sensation in $Concubine.slaveName's vagina feels incredible.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					<<set $slaves[_concubine].counter.vaginal++, $vaginalTotal++>>
 				<</if>>
 			<</if>>
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 5641e0dafe6601b93b84e3bc4113f4a4403a15dd..5e8139f97e30fe21628b6d39df3f4e2e0c0004be 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -1620,11 +1620,7 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 		<<case "repopulation focus">>
 			_HisA belly is round with child and is in a constant struggle with _hisA erect cock over which gets to protrude out _hisA front.
 		<<case "eugenics">>
-<<<<<<< HEAD
-			_HeA's become even more irresistible lately; <<if $PC.vagina >= 1>>you can't help but think of that perfect cock cumming deep in your pussy and your belly rounding with a gorgeous child<<else>>the children sired by such a stud are unimaginable<</if>>.
-=======
 			_HeA's become even more irresistible lately; <<if $PC.vagina != -1>>you can't help but think of that perfect cock cumming deep in your pussy and your belly rounding with a gorgeous child<<else>>the children sired by such a stud are unimaginable<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<case "gender radicalist">>
 			<<if $arcologies[0].FSGenderRadicalistLawFuta == 1>>
 				_HeA is wearing nothing at all and has recently rendered _himselfA slightly more feminine. _HeA makes sure to make exaggerated motions to show off the pussy hidden beneath _hisA swinging nuts.
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index cc67363e43c3d92ac755880ad5dc22f41a5f9690..50417478179dc6664957cfc80f85268ce2ee7a06 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -21,13 +21,8 @@
 <<case "build her devotion">>
 	<<set $activeSlave.devotion += 6>>
 	<<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish == "submissive")>>
-<<<<<<< HEAD
-		Since $activeSlave.slaveName is a submissive, you @@.hotpink;build $his devotion to you@@ by indulging $his need to be dominated. Already smiling to $himself, $he changes into bondage gear that blinds $him, forces $his arms behind $his back, forces $him to present $his breasts uncomfortably, and forces a painfully large dildo up $his <<if $activeSlave.vagina > 0>>vagina<<if $activeSlave.anus > 0>> and anus<</if>><<elseif $activeSlave.anus > 0>>anus<</if>>. Thus attired, $he is forced to serve you in whatever petty ways occur to you. $He holds your tablet for you on $his upthrust ass as you work, holds a thin beverage glass for you in $his upturned mouth when you eat, and lies still so you can use $his tits as a pillow whenever you recline. $He loves it.
-	<<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish == "cumslut") && ($PC.dick >= 1)>>
-=======
 		Since $activeSlave.slaveName is a submissive, you @@.hotpink;build $his devotion to you@@ by indulging $his need to be dominated. Already smiling to $himself, $he changes into bondage gear that <<if canSee($activeSlave)>>blinds $him<<else>>covers $his face<</if>><<if hasAnyArms($activeSlave)>>, forces $his arm<<if hasBothArms($activeSlave)>>s<</if>> behind $his back<</if>>, forces $him to present $his breasts uncomfortably, and forces a painfully large dildo up $his <<if $activeSlave.vagina > 0>>vagina<<if $activeSlave.anus > 0>> and anus<</if>><<elseif $activeSlave.anus > 0>>anus<</if>>. Thus attired, $he is forced to serve you in whatever petty ways occur to you. $He holds your tablet for you on $his upthrust ass as you work, holds a thin beverage glass for you in $his upturned mouth when you eat, and lies still so you can use $his tits as a pillow whenever you recline. $He loves it.
 	<<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish == "cumslut") && ($PC.dick != 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		Since $activeSlave.slaveName has an unusual taste for oral sex and cum, you @@.hotpink;build $his devotion to you@@ by indulging $him. You allow $him to spend $his free time following you around. $He is permitted to act as your private cum receptacle. If you use another slave, you usually pull out and give $his smiling face a facial. When you come inside another slave instead, $activeSlave.slaveName is allowed to get your cum anyway, regardless of whether that requires the other slave to spit it into $his mouth or $activeSlave.slaveName to suck it out of the other slave's vagina or rectum. Either way, $he rubs $his stomach happily after $he's swallowed it down.
 		<<set $activeSlave.counter.oral += 20, $oralTotal += 20>>
 	<<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish == "boobs")>>
@@ -44,16 +39,12 @@
 		<<if (hasBothLegs($activeSlave))>>
 			bring $him on a leash and have $him service you in public. $He comes harder than ever when you push $him down on $his knees in a crowded public arcology elevator and facefuck $him while $he
 		<<else>>
-<<<<<<< HEAD
-			carry $him out and have $him service you in public. $He comes harder than ever when you push $his face to your <<if $PC.dick >= 1>>dick<<else>>pussy<</if>> in a crowded public arcology elevator and facefuck $him while $he tries $his hardest to masturbate.
-=======
 			carry $him out and have $him service you in public. $He comes harder than ever when you push $his face to your <<if $PC.dick != 0>>dick<<else>>pussy<</if>> in a crowded public arcology elevator and facefuck $him while $he
 		<</if>>
 		<<if (hasAnyArms($activeSlave))>>
 			masturbates fervently.
 		<<else>>
 			tries $his hardest to masturbate.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<</if>>
 		<<set $activeSlave.counter.oral += 8, $oralTotal += 8>>
 	<<elseif ($activeSlave.anus == 3) && ($activeSlave.vagina == 3) && $activeSlave.geneMods.rapidCellGrowth != 1>>
@@ -153,11 +144,7 @@
 			$activeSlave.slaveName is odd. $He's usually annoying, but on occasion $his oddities can produce great comic relief. You strike a careful balance with $him, punishing $him when $he irritates you, but allowing and even rewarding harmless little idiosyncrasies.
 		<<elseif ($activeSlave.behavioralFlaw == "hates men")>>
 			$activeSlave.slaveName does not like men. $He desperately needs social contact, though, so you encourage $him to rely on women to address $his emotional needs. This is easy, since
-<<<<<<< HEAD
-			<<if $PC.vagina >= 1>>
-=======
 			<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				you've got a pussy yourself.
 			<<else>>
 				there are several readily available.
@@ -483,11 +470,7 @@
 		Old traditions should not be forgotten. The scourge is the oldest slavebreaking tool known to man, and to slave <<= $girl>>s who do not properly obey _womenP. For the whole week, whenever $activeSlave.slaveName disobeys you or whenever the whim strikes, you bind $him securely and flog $him without mercy. You use a soft leather appliance and apply medical care afterward, so there will be no permanent scarring, but @@.red;$his health is affected and the beatings leave $him with a $activeSlave.minorInjury.@@ $He is subjected to @@.mediumorchid;immense mental pressure@@ @@.gold;in favor of obedience.@@
 	<<elseif ($activeSlave.devotion < -50) && canDoAnal($activeSlave)>>
 		<<set $activeSlave.minorInjury = either("black eye", "bruise", "split lip")>>
-<<<<<<< HEAD
-		$activeSlave.slaveName is willing to physically defend $himself against sexual abuse. Training $him out of this rebelliousness is a nice sexual change of pace. For the entire week, whenever $he commits some minor sin, you fight $him into a state of physical submission and then sodomize $him. This usually requires an extended beating to render $him quiescent, followed by holding $him down so that $his struggles do not dislodge your <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> from $his delightfully spasming butthole. $He is subjected to @@.mediumorchid;immense mental pressure@@ @@.gold;in favor of obedience,@@ but the extreme stress @@.red;affects $his health, leaving $him with a $activeSlave.minorInjury.@@
-=======
 		$activeSlave.slaveName is willing to physically defend $himself against sexual abuse. Training $him out of this rebelliousness is a nice sexual change of pace. For the entire week, whenever $he commits some minor sin, you fight $him into a state of physical submission and then sodomize $him. This usually requires an extended beating to render $him quiescent, followed by holding $him down so that $his struggles do not dislodge your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> from $his delightfully spasming butthole. $He is subjected to @@.mediumorchid;immense mental pressure@@ @@.gold;in favor of obedience,@@ but the extreme stress @@.red;affects $his health, leaving $him with a $activeSlave.minorInjury.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<= VCheck.Anal(6)>>
 	<<elseif ($activeSlave.scrotum > 0)>>
 		<<set $activeSlave.minorInjury = either("black eye", "bruise", "split lip")>>
@@ -557,11 +540,7 @@
 		$activeSlave.slaveName is odd. $He behaves strangely, speaking randomly at times and doing things for no apparent reason. In earlier times this might have been considered 'adorable' or 'unique,' but in a slave it's just annoying. You punish $him severely whenever $he fails to do or say the right thing for the right reasons.
 	<<elseif ($activeSlave.behavioralFlaw == "hates men")>>
 		$activeSlave.slaveName does not like spending time around men. This is of course a huge obstacle to $him performing $his duties well. Breaking $him of this is an unusually difficult task,
-<<<<<<< HEAD
-		<<if $PC.dick >= 1>>
-=======
 		<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			so you approach it subtly. You simply require $him to spend as much time as possible around you, eating, sleeping, and going about normal business. $He already understood what you were to your slaves, sexually; $he now is accustomed to who you are when your cock isn't pounding a nice hole.
 		<<else>>
 			all the more so since you cannot use yourself as a teaching tool. Fortunately, there are any number of men coming and going as you do business, and it's trivial to force $him to rely on them for social contact.
@@ -653,11 +632,7 @@
 		$activeSlave.slaveName does not pay enough attention to standards when having sex, leading to crude comments and unsexy noises. To remedy this, you have $him give you oral regularly: a sacrifice, but you make sacrifices for your slaves' improvement. Oral sex can be difficult to make elegant, but you work with $him to make it as pretty as possible, and spank $him cruelly when $he fails.
 		<<set $activeSlave.counter.oral += 10, $oralTotal += 10>>
 	<<case "judgemental">>
-<<<<<<< HEAD
-		$activeSlave.slaveName has a bad habit of being sexually judgemental, belittling anyone who doesn't live up to $his pretensions of standards. To $his regret, $he frequently implies that $he prefers partners with big dicks: regret, because whenever $he's caught doing this, you have $him brought to you and <<if $PC.dick >= 1>>apply your big dick<<else>>apply a big dildo<</if>>
-=======
 		$activeSlave.slaveName has a bad habit of being sexually judgemental, belittling anyone who doesn't live up to $his pretensions of standards. To $his regret, $he frequently implies that $he prefers partners with big dicks: regret, because whenever $he's caught doing this, you have $him brought to you and <<if $PC.dick != 0>>apply your big dick<<else>>apply a big dildo<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<if ($activeSlave.anus > 0) && canDoAnal($activeSlave)>>
 			to $his anus without mercy.
 			<<= VCheck.Anal(10)>>
@@ -677,11 +652,7 @@
 	<<case "cum addict">>
 		$activeSlave.slaveName is utterly addicted to cum. You keep $him in your office whenever you can, and subject $him to a strict sexual diet of
 		<<if canDoVaginal($activeSlave)>>sex,<<elseif canDoAnal($activeSlave)>>buttsex,<<else>>breast play,<</if>>
-<<<<<<< HEAD
-		no oral allowed, no matter how much $he begs to be permitted to <<if $PC.dick >= 1>>suck you off<<else>>eat you out<</if>>.
-=======
 		no oral allowed, no matter how much $he begs to be permitted to <<if $PC.dick != 0>>suck you off<<else>>eat you out<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<if canDoVaginal($activeSlave)>><<= VCheck.Vaginal(10)>><<elseif canDoAnal($activeSlave)>><<= VCheck.Anal(10)>><</if>>
 	<<case "anal addict">>
 		$activeSlave.slaveName is utterly addicted to buttsex. You keep $him in your office whenever you can, and subject $him to a strict sexual diet of
@@ -941,11 +912,7 @@
 	<</if>>
 	<<if $activeSlave.training < 100>> <<= IncreasePCSkills('slaving', 0.2)>> <<else>> <<= IncreasePCSkills('slaving', 0.5)>> <</if>>
 <<case "induce hatred of men">>
-<<<<<<< HEAD
-	In order to make $him hate men, you sometimes simply <<if $PC.dick >= 1>>stick your dick in $him without asking<<else>>stuff a strap-on inside $him without asking<</if>>, and sometimes force shockingly juvenile pranks on $him. $He is regularly smacked in the face with floppy dildos.
-=======
 	In order to make $him hate men, you sometimes simply <<if $PC.dick != 0>>stick your dick in $him without asking<<else>>stuff a strap-on inside $him without asking<</if>>, and sometimes force shockingly juvenile pranks on $him. $He is regularly smacked in the face with floppy dildos.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<InduceFlawAbuseEffects>>
 	<<if canDoVaginal($activeSlave)>><<= VCheck.Vaginal(10)>><<elseif canDoAnal($activeSlave)>><<= VCheck.Anal(10)>><<else>><<set $activeSlave.counter.oral += 10, $oralTotal += 10>><</if>>
 	<<if $activeSlave.training < 100>>
@@ -1106,11 +1073,7 @@
 	<</if>>
 	<<if $activeSlave.training < 100>> <<= IncreasePCSkills('slaving', 0.2)>> <<else>> <<= IncreasePCSkills('slaving', 0.5)>> <</if>>
 <<case "induce judgement">>
-<<<<<<< HEAD
-	Since you've decided to make $him sexually judgemental, you keep $him in your office and fuck $him, <<if $PC.dick >= 1>>praising $him whenever $he takes your big dick well<<else>>using a huge strap-on on $him and praising $him when $he takes it like a good $girl<</if>>. You also judge others' endowments in $his presence.
-=======
 	Since you've decided to make $him sexually judgemental, you keep $him in your office and fuck $him, <<if $PC.dick != 0>>praising $him whenever $he takes your big dick well<<else>>using a huge strap-on on $him and praising $him when $he takes it like a good $girl<</if>>. You also judge others' endowments in $his presence.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<InduceFlawLenityEffects>>
 	<<if $activeSlave.training < 100>>
 		$He writes this off as bravado, and will need more training.
@@ -1121,11 +1084,7 @@
 	<</if>>
 	<<if $activeSlave.training < 100>> <<= IncreasePCSkills('slaving', 0.2)>> <<else>> <<= IncreasePCSkills('slaving', 0.5)>> <</if>>
 <<case "induce cum addiction">>
-<<<<<<< HEAD
-	The cumslut is quite pleased when you order $him to stay in your office whenever $he can for use as one of your personal oral toys. You carefully limit $his orgasms to when <<if $PC.dick >= 1>>you're blowing your load down $his throat<<else>>$he's swallowing your pussyjuice<</if>>, and make $his oral adventures predictably regular.
-=======
 	The cumslut is quite pleased when you order $him to stay in your office whenever $he can for use as one of your personal oral toys. You carefully limit $his orgasms to when <<if $PC.dick != 0>>you're blowing your load down $his throat<<else>>$he's swallowing your pussyjuice<</if>>, and make $his oral adventures predictably regular.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<set $activeSlave.counter.oral += 10, $oralTotal += 10>>
 	<<if $activeSlave.training < 100>>
 		$He enjoys giving you lots of oral, but will need more training to develop psychological addiction to it.
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 137e707b331b2aad2861ef22f8d3e5a72a591d60..6565ff97e30d75e6cd77be126196364f66aae75c 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -294,11 +294,7 @@
 						<<set $buttslutInterestTargetID = $slaves[$i].ID>>
 					<</if>>
 					<<if ($cumslutID != 0) && ($cumslutInterestTargetID == 0)>>
-<<<<<<< HEAD
-						<<if $PC.dick >= 1>>
-=======
 						<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 							<<set $REFIevent.push("cumslut")>>
 						<</if>>
 						<<set $cumslutInterestTargetID = $slaves[$i].ID>>
@@ -1293,11 +1289,7 @@
 					<<set $events.push("RES Move")>>
 					<<set $events.push("RES Move")>>
 					<<set $RESMove.push("TFS")>>
-<<<<<<< HEAD
-					<<if ($PC.dick >= 1) && ($PC.vagina >= 1) && ($PC.boobs >= 1)>>
-=======
 					<<if ($PC.dick != 0) && ($PC.vagina != -1) && ($PC.boobs >= 300)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 						<<set $events.push("RES Move")>>
 						<<set $events.push("RES Move")>>
 						<<set $RESMove.push("TFS")>>
@@ -1356,11 +1348,7 @@
 				<<if ($TFS.studentsBought == 0)>>
 				<<set $events.push("RES Sale")>>
 					<<set $RESSale.push("TFS")>>
-<<<<<<< HEAD
-					<<if ($PC.dick >= 1) && ($PC.vagina >= 1) && ($PC.boobs >= 1)>>
-=======
 					<<if ($PC.dick != 0) && ($PC.vagina != -1) && ($PC.boobs >= 300)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 						<<set $events.push("RES Sale")>>
 						<<set $events.push("RES Sale")>>
 						<<set $RESSale.push("TFS")>>
diff --git a/src/uncategorized/reBusyMasterSuite.tw b/src/uncategorized/reBusyMasterSuite.tw
index 157ed03fc7b1f4164d8d41fce507d3111d3cd48d..de91252033bd4a1fbc6063026990d53e634aff2f 100644
--- a/src/uncategorized/reBusyMasterSuite.tw
+++ b/src/uncategorized/reBusyMasterSuite.tw
@@ -209,11 +209,7 @@ who has paused $his thrusting to issue a peremptory order to the slaves to stay
 	<<else>>
 		lips
 	<</if>>
-<<<<<<< HEAD
-	around your <<if ($PC.dick == 0)>>clit<<else>>cock<<if $PC.vagina >= 1>> and starts stroking your pussy<</if>><</if>> eagerly enough, even as _msSlaves[1].slaveName goes back to sodomizing _him2. The anal train is fairly gentle, since anything too fast would disintegrate the gymnastic arrangement, but _msSlaves[0].slaveName is still getting enough of a buttfuck that _he2 whimpers quietly into your <<if ($PC.vagina >= 1)>>pussy<<else>>dick<</if>>, a nice feeling. The blowjob is <<if (_msSlaves[0].skill.oral >= 100)>>masterful, despite the distraction<<elseif (_msSlaves[0].skill.oral > 10)>>serviceable, despite the distraction<<else>>only mediocre, but serviceable enough<</if>>, so you let _him2 work for a while before gently shoving _him2 off the side of the bed and telling _him2 to get to the back of the line. The slaves all shuffle forward awkwardly, and inadvertently block your view so that you hear rather than see _msSlaves[0].slaveName start groping your concubine $Concubine.slaveName's
-=======
 	around your <<if ($PC.dick == 0)>>clit<<else>>cock<<if $PC.vagina != -1>> and starts stroking your pussy<</if>><</if>> eagerly enough, even as _msSlaves[1].slaveName goes back to sodomizing _him2. The anal train is fairly gentle, since anything too fast would disintegrate the gymnastic arrangement, but _msSlaves[0].slaveName is still getting enough of a buttfuck that _he2 whimpers quietly into your <<if ($PC.vagina != -1)>>pussy<<else>>dick<</if>>, a nice feeling. The blowjob is <<if (_msSlaves[0].skill.oral >= 100)>>masterful, despite the distraction<<elseif (_msSlaves[0].skill.oral > 10)>>serviceable, despite the distraction<<else>>only mediocre, but serviceable enough<</if>>, so you let _him2 work for a while before gently shoving _him2 off the side of the bed and telling _him2 to get to the back of the line. The slaves all shuffle forward awkwardly, and inadvertently block your view so that you hear rather than see _msSlaves[0].slaveName start groping your concubine $Concubine.slaveName's
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<if $activeSlave.butt > 15>>
 		immeasurable
 	<<elseif $activeSlave.butt > 10>>
diff --git a/src/uncategorized/reCitizenHookup.tw b/src/uncategorized/reCitizenHookup.tw
index 150515808a7136096dac2fdc11d13439c445b398..ccfb3081442be6115c9ff9eceb15a14088065424 100644
--- a/src/uncategorized/reCitizenHookup.tw
+++ b/src/uncategorized/reCitizenHookup.tw
@@ -317,11 +317,7 @@ She's clearly attracted to you; even the most consummate actress would have diff
 	<</if>>
 	When your guest is finally spent, she showers, dresses, and leaves discreetly, offering you a proper thank you. This is the kind of thing that @@.green;builds a lasting reputation@@ in the Free Cities.
 	<<run repX(5000, "event")>>
-<<<<<<< HEAD
-	<<if _FS == "Repopulationist" && $PC.dick >= 1 && $arcologies[0].FSRepopulationFocusLaw == 0 && (random(1,100) > 40)>>
-=======
 	<<if _FS == "Repopulationist" && $PC.dick != 0 && _repopHookupPregnant == 0 && (random(1,100) > 40)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $desc = "a tasteful morning-after message, with attached positive pregnancy test, from a pretty " + _FS + " citizen you bred">>
 		<<set $trinkets.push($desc)>>
 	<<elseif _FS != "none">>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index 35ce430f639b6032bb5181265baaffe14350effd..36436003b824de8ddcdf8edb19526c37a474354b 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -121,11 +121,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
 <<link "Amusing. Enslave _him2">>
 	<<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
 	<<replace "#result">>
-<<<<<<< HEAD
-	$assistantName ushers _him2 into your penthouse and keeps _him2 busy for the few minutes you need to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing. Fortunately, you're cleverer and richer than most, and you succeed. You have _him2 brought into your office, and you are pleased to see _him2. _He2's not young and _he2's not pretty, but _his2 suit cannot disguise _his2 big bottom, and _he2's using the tablet _he2 has clasped protectively against _his2 chest to conceal a huge pair of mature breasts. _He2 knows exactly what's happened, and fixes you with a gimlet stare. "In a couple of month<<s>>," _he2 says with venom, "when you've filled me full of hormone<<s>> and drug<<s>> and training, and I'm begging you to <<if $PC.dick >= 1>><<s>>tick your tiny little dick up<<else>>fi<<s>>t<</if>> my a<<ss>>hole, remember thi<<s>>. It'll be conditioning and <<s>>elf-pre<<s>>ervation and <<S>>tockholm <<S>>yndrome talking, not me. I think you're a <<if $PC.title == 1>><<s>>ad ba<<s>>tard<<else>>vile cunt<</if>>, and I alway<<s>> will."
-=======
 	$assistantName ushers _him2 into your penthouse and keeps _him2 busy for the few minutes you need to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing. Fortunately, you're cleverer and richer than most, and you succeed. You have _him2 brought into your office, and you are pleased to see _him2. _He2's not young and _he2's not pretty, but _his2 suit cannot disguise _his2 big bottom, and _he2's using the tablet _he2 has clasped protectively against _his2 chest to conceal a huge pair of mature breasts. _He2 knows exactly what's happened, and fixes you with a gimlet stare. "In a couple of month<<s>>," _he2 says with venom, "when you've filled me full of hormone<<s>> and drug<<s>> and training, and I'm begging you to <<if $PC.dick != 0>><<s>>tick your tiny little dick up<<else>>fi<<s>>t<</if>> my a<<ss>>hole, remember thi<<s>>. It'll be conditioning and <<s>>elf-pre<<s>>ervation and <<S>>tockholm <<S>>yndrome talking, not me. I think you're a <<if $PC.title == 1>><<s>>ad ba<<s>>tard<<else>>vile cunt<</if>>, and I alway<<s>> will."
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<set $shelterAbuse += 10>>
 	<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
 	<<include "New Slave Intro">>
diff --git a/src/uncategorized/reShowerPunishment.tw b/src/uncategorized/reShowerPunishment.tw
index 2078facc46e7415bd2e1e71f21b35efde6794753..2497a8acf43fae33bc13baa65d8e184da27cb798 100644
--- a/src/uncategorized/reShowerPunishment.tw
+++ b/src/uncategorized/reShowerPunishment.tw
@@ -99,11 +99,7 @@ $activeSlave.slaveName is being very thorough. When you first appeared, $he was
 	<br><br>
 	You run a hand up the side of _his2 neck, bringing it to rest with your fingers cupping _him2 under the ear and your thumb running up along _his2 temple. _He2 shivers, unable to concentrate despite all _his2 poise, the ongoing oral service blending into your intense closeness. Right now, _he2's the <<if $HeadGirl.physicalAge > 25>>_woman2<<else>>_girl2<</if>> for you, so you snap your fingers next to the ear of the slave <<if $HeadGirl.vagina > -1>>eating _him2 out<<else>>blowing _him2<</if>>, point at the dropped sponge, and then point at yourself. The oral stops as $activeSlave.slaveName hurries to scrub you, starting at your feet, but your Head Girl doesn't care. You're kissing _him2.
 	<br><br>
-<<<<<<< HEAD
-	_He2 gently strokes your <<if $PC.dick >= 1>>rapidly hardening member, smiling into your mouth at the speed with which it stiffens<<if $PC.vagina >= 1>>, and teases your pussylips with mischievous fingers<</if>><<else>>flushed cunt, smiling into your mouth at the moisture that instantly coats _his2 fingertips<</if>>. You reach out in turn,
-=======
 	_He2 gently strokes your <<if $PC.dick != 0>>rapidly hardening member, smiling into your mouth at the speed with which it stiffens<<if $PC.vagina != -1>>, and teases your pussylips with mischievous fingers<</if>><<else>>flushed cunt, smiling into your mouth at the moisture that instantly coats _his2 fingertips<</if>>. You reach out in turn,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<if $HeadGirl.vagina > -1>>
 		caressing _his2 pussylips before slowly inserting a digit inside _his2 warmth while nuzzling _his2 clit with the knuckle of your thumb. At the first real brush against _his2 clitoris, the overstimulated $HeadGirl.slaveName climaxes, pulling _his2 mouth away from you to shout your name and then sobbing thanks into your ear.
 	<<else>>
diff --git a/src/uncategorized/reStaffedMorning.tw b/src/uncategorized/reStaffedMorning.tw
index 81c942444e31b8e9beb3f1fc2eafc6cc6b8fcba2..dc9c483dee27c2cf3901a342076125d684a5c5e5 100644
--- a/src/uncategorized/reStaffedMorning.tw
+++ b/src/uncategorized/reStaffedMorning.tw
@@ -92,11 +92,7 @@ The bathroom door is open and the shower is running. Though the steam is beginni
 	<</if>>
 	<br><br>
 	Back in the bedroom, your clothes have been laid out, ready for _bedSlaves[0].slaveName and _bedSlaves[1].slaveName to dress you.
-<<<<<<< HEAD
-	<<if $PC.dick >= 1>>
-=======
 	<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		Next to the neat stack of clothes, the two slaves are bent over the bed with their buttocks spread. They're perfectly still, awaiting your pleasure. You select _bedSlaves[1].slaveName and ram your dick up _his2 <<if _bedSlaves[1].anus > 2>>welcoming asspussy<<elseif _bedSlaves[1].anus > 1>>soft butthole<<else>>tight anus<</if>>, assraping _him2 without mercy while _bedSlaves[0].slaveName buttons your shirt. When it's done, you push $him down next to _bedSlaves[1].slaveName and switch assholes, letting _bedSlaves[1].slaveName up to do _his2 best to help you into your trousers in the meantime. _He2 gets them on and fastens everything, except the fly, of course. When _bedSlaves[0].slaveName has been buttfucked into helplessness, you throw $him away like the human sex toy $he is and pound _bedSlaves[1].slaveName and then the dried-off _bedSlaves[3].slaveName and _bedSlaves[2].slaveName senseless, careful to frequently pull far enough out that the slaves have to take the pain of initial penetration again.
 	<<else>>
 		Next to the neat stack of clothes, the two slaves are bent over the bed with their buttocks spread. They're perfectly still, awaiting your pleasure. You select _bedSlaves[1].slaveName and ram your strap-on up _his2 <<if _bedSlaves[1].anus > 2>>welcoming asspussy<<elseif _bedSlaves[1].anus > 1>>soft butthole<<else>>tight anus<</if>>, assraping _him2 without mercy while _bedSlaves[0].slaveName helps you into your top. When it's done, you push $him down next to _bedSlaves[1].slaveName and switch assholes, letting _bedSlaves[1].slaveName up to do _his2 best to dress your lower half. When _bedSlaves[0].slaveName has been buttfucked into helplessness, you throw $him away like the human sex toy $he is and pound _bedSlaves[1].slaveName and then the dried-off _bedSlaves[3].slaveName and _bedSlaves[2].slaveName senseless, careful to frequently pull far enough out that the slaves have to take the pain of initial penetration again.
diff --git a/src/uncategorized/reStandardPunishment.tw b/src/uncategorized/reStandardPunishment.tw
index 9441927284940b262b477d0d597fea8ae05c8e46..b39ebca3443e4c74e545c8b596181fcfcfff8aa0 100644
--- a/src/uncategorized/reStandardPunishment.tw
+++ b/src/uncategorized/reStandardPunishment.tw
@@ -321,11 +321,7 @@
 		<<set $activeSlave.counter.anal += 1>>
 		<<set $analTotal += 1>>
 	<<else>>
-<<<<<<< HEAD
-		push $his legs together, settling for some <<if $PC.dick >= 1>>frottage<<else>>tribbing<</if>> to preserve $his virginit<<if $activeSlave.vagina == -1>>y<<else>>ies<</if>>. Since you're not fucking $him, you spank $his ass mercilessly to make it an effective punishment.
-=======
 		push $his <<if hasBothLegs($activeSlave)>>legs<<else>>cheeks<</if>> together, settling for some <<if $PC.dick != 0>>frottage<<else>>tribbing<</if>> to preserve $his virginit<<if $activeSlave.vagina == -1>>y<<else>>ies<</if>>. Since you're not fucking $him, you spank $his ass mercilessly to make it an effective punishment.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.counter.oral += 1>>
 		<<set $oralTotal += 1>>
 	<</if>>
@@ -342,17 +338,6 @@
 	<<replace "#result">>
 	You order the horny $desc to apologize to the slave $he grabbed, which $he does, <<if canTalk($activeSlave)>>managing to sound authentically sorry<<else>>gesturing $his regret with apparent sincerity<</if>>. It seems $he might feel some actual guilt at molesting a fellow slave, but $he's about to feel much sorrier. Once the other slave has been dismissed, you grab $him by the neck and
 	<<if canDoVaginal($activeSlave) && ($activeSlave.vagina != 0)>>
-<<<<<<< HEAD
-		shove $him up against the nearest wall, using a bit of warning pressure of your fingers against $his throat to warn $him to take $his punishment. Then you <<if $PC.dick >= 1>>jam your cock inside $him, making $him wriggle from the uncomfortable angle<<else>>grind your pussy against $him, fucking $him hard despite the lack of penetration<</if>>.
-		<<set $activeSlave.counter.vaginal += 1>>
-		<<set $vaginalTotal += 1>>
-	<<elseif canDoAnal($activeSlave) && ($activeSlave.anus != 0)>>
-		shove $his face against the nearest wall, using a bit of warning pressure of your fingers against $his throat to warn $him to take $his punishment. Then you <<if $PC.dick >= 1>>jam your cock up $his butt, making $his sphincter spasm from the rough penetration<<else>>use one hand to fuck $his ass and the other to look after yourself<</if>>.
-		<<set $activeSlave.counter.anal += 1>>
-		<<set $analTotal += 1>>
-	<<else>>
-		pull $him to $his knees, <<if $PC.dick >= 1>>shoving your dick down $his throat<<else>>straddling $his face and grinding yourself against $his mouth<</if>>.
-=======
 		shove $him up against the nearest wall, using a bit of warning pressure of your fingers against $his throat to warn $him to take $his punishment. Then you <<if $PC.dick != 0>>jam your cock inside $him, making $him wriggle from the uncomfortable angle<<else>>grind your pussy against $him, fucking $him hard despite the lack of penetration<</if>>.
 		<<set $activeSlave.counter.vaginal += 1>>
 		<<set $vaginalTotal += 1>>
@@ -362,7 +347,6 @@
 		<<set $analTotal += 1>>
 	<<else>>
 		pull $him to $his knee<<if hasBothLegs($activeSlave)>>s<</if>>, <<if $PC.dick != 0>>shoving your dick down $his throat<<else>>straddling $his face and grinding yourself against $his mouth<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<set $activeSlave.counter.oral += 1>>
 		<<set $oralTotal += 1>>
 	<</if>>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index 98258adf8a7c33d81c21853076664012a2d1552f..76053863c80763aeafe52aee8be5a9e3c80e89cf 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -281,11 +281,7 @@ _enduringRep = $enduringRep>>
 				<<= FutureSocieties.Change("GenderRadicalist", -1)>>
 				<<run repX(-1000, "PCactions")>>
 			<</if>>
-<<<<<<< HEAD
-		<<elseif $arcologies[0].FSGenderFundamentalist != "unset" && $PC.vagina >= 1 && $PC.title == 0>>
-=======
 		<<elseif $arcologies[0].FSGenderFundamentalist != "unset" && $PC.vagina != -1 && $PC.title == 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if $rep > 10000>>
 				Society has grown accustomed to your efforts enough to not care that you enjoy slave dick. In fact, it even @@.green;strengthens@@ traditional gender roles, even though you insist on breaking them.
 				<<= FutureSocieties.Change("GenderFundamentalist", 1)>>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index a32154b9df33c25a56e62df651ba2ff1d5b51930..0b0bf27bc1d66d5b98f1e41b8fb60512cd0e5d6d 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -854,11 +854,7 @@ The failure of a prominent organization within your arcology has @@.red;affected
 			<<set $vaginalTotal += 1>>
 		<</if>>
 	<</for>>
-<<<<<<< HEAD
-	You <<if $PC.dick >= 1>>whip out your dick<<else>>pull on a strap-on, the one you use for disobedient slaves,<</if>> and kneel down behind the sobbing futa matron. When $he feels it touching $his pussylips, $he whispers "Thank you, <<Master>>," through $his tears. $He's very, very sexually experienced, so it's harder to make $him feel it than it would be for a $girl with tighter holes. But you're an expert. You calibrate your pounding to pull just barely too far out, so that $he feels you ramming mercilessly into $him with each stroke, and so that the slightest mistake from $him sends <<if $PC.dick >= 1>>your cock<<else>>the phallus<</if>> right up the other hole. Despite $his anguish and the brutal fuck, or perhaps because of them, $he slowly manages to get hard, and orgasms painfully when you do. $He @@.hotpink;can't seem to stop thanking you,@@ but is quiet when you tell $him to be.
-=======
 	You <<if $PC.dick != 0>>whip out your dick<<else>>pull on a strap-on, the one you use for disobedient slaves,<</if>> and kneel down behind the sobbing futa matron. When $he feels it touching $his pussylips, $he whispers "Thank you, <<Master>>," through $his tears. $He's very, very sexually experienced, so it's harder to make $him feel it than it would be for a $girl with tighter holes. But you're an expert. You calibrate your pounding to pull just barely too far out, so that $he feels you ramming mercilessly into $him with each stroke, and so that the slightest mistake from $him sends <<if $PC.dick != 0>>your cock<<else>>the phallus<</if>> right up the other hole. Despite $his anguish and the brutal fuck, or perhaps because of them, $he slowly manages to get hard, and orgasms painfully when you do. $He @@.hotpink;can't seem to stop thanking you,@@ but is quiet when you tell $him to be.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<</replace>>
 <</link>>
 <br>
diff --git a/src/uncategorized/resMove.tw b/src/uncategorized/resMove.tw
index c6fb9c90c5334616b7f2320c4827c72f890549df..56700c391fc8435043465b6ecf8623b78b4b088c 100644
--- a/src/uncategorized/resMove.tw
+++ b/src/uncategorized/resMove.tw
@@ -32,13 +32,8 @@
 <<elseif $RESMove == "NUL">>
 	You receive a personal call from a senior representative of Nueva Universidad de Libertad. "<<if $PC.slaveSurname>>Mx. <<print $PC.slaveSurname>><<else>><<print $PC.slaveName>><</if>>," they say without preamble, "Nueva Universidad de Libertad would like to open a branch campus in $arcologies[0].name. We'd like to ask for a significant reduction in rent from your standard rate, since we could bring significant benefits to you through our presence." After some further pleasantries, they urge you to consider the offer, wish you a pleasant day, and end the call.
 <<else>>
-<<<<<<< HEAD
-	You receive a personal call from a senior Futanari Sister — not the one you helped win the power struggle over futa balls. "<<if $PC.surname>><<if $PC.title>>Mr.<<else>>Ms.<</if>> <<print $PC.surname>><<else>><<print $PC.name>><</if>>," she says with the odd confidence all elder Sisters share, "our numbers are growing,
-	<<if ($PC.dick >= 1) && ($PC.vagina >= 1) && ($PC.boobs >= 1)>>
-=======
 	You receive a personal call from a senior Futanari Sister — not the one you helped win the power struggle over futa balls. "_playerName," she says with the odd confidence all elder Sisters share, "our numbers are growing,
 	<<if ($PC.dick != 0) && ($PC.vagina != -1) && ($PC.boobs >= 300)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		and we are very eager to become closer to you. Normally, we would ask for lowered rent in return for the benefits we bring an arcology, but for you, we are unwilling to ask even that. We shall charge others more for their purchase of Sisters instead. Please, will you have us?" She bats her eyes at you, looking very willing to be had.
 	<<else>>
 		and you have shown yourself to be our friend. Would you accept one of our communities in $arcologies[0].name? We'd like to ask for a significant reduction in rent from your standard rate, since we could bring significant benefits to you through our presence."
@@ -94,11 +89,7 @@
 	_HeA presents _hisA conclusions:
 <</if>>
 as you suspected,
-<<<<<<< HEAD
-<<if ($RESMove == "TFS") && ($PC.dick >= 1) && ($PC.vagina >= 1) && ($PC.boobs >= 1)>>
-=======
 <<if ($RESMove == "TFS") && ($PC.dick != 0) && ($PC.vagina != -1) && ($PC.boobs >= 300)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	your futanari status means there are no potential downsides. Just having them present would probably be good for the arcology's prosperity.
 <<else>>
 	you'd run a loss on the rent, even bargaining them up as far as they'd be likely to go. On the other hand, just having them present would probably be good for the arcology's prosperity.
@@ -342,11 +333,7 @@ presence in the arcology, reaping all sorts of benefits. Alternatively, you migh
 			<<set $TFS.schoolPresent = 1>>
 		<</if>>
 	<</replace>>
-<<<<<<< HEAD
-<</link>> <<if ($RESMove == "TFS") && ($PC.dick >= 1) && ($PC.vagina >= 1) && ($PC.boobs >= 1)>><<else>>//This will add minor upkeep costs//<</if>>
-=======
 <</link>> <<if ($RESMove == "TFS") && ($PC.dick != 0) && ($PC.vagina != -1) && ($PC.boobs >= 300)>><<else>>//This will add minor upkeep costs//<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 <br><<link "Politely decline">>
 	<<replace "#result">>
 		You call them back and politely communicate that your terms for rental of space in the arcology are not subject to special modification, even for trusted partners. This explanation is graciously accepted.
diff --git a/src/uncategorized/resSale.tw b/src/uncategorized/resSale.tw
index c4adf79f6d2ba7755320af80168c82e83623c754..5bd590089f3f1427d1c885103e0c954ea21b4832 100644
--- a/src/uncategorized/resSale.tw
+++ b/src/uncategorized/resSale.tw
@@ -347,11 +347,7 @@ You pause for a moment, and $he plunges on: "<<if $PC.title != 0>>Sir<<else>>Ma'
 		<<case "incubus">>
 			"And I love to fuck futas!" _heA exclaims, _hisA erect dick throbbing with anticipation.
 		<<case "succubus">>
-<<<<<<< HEAD
-			"And I love to get fucked by futas!" _heA exclaims, <<if $PC.dick >= 1 && $PC.vagina >= 1>>blowing you a kiss<<else>>_hisA pussy already wet with anticipation<</if>>.
-=======
 			"And I love to get fucked by futas!" _heA exclaims, <<if $PC.dick != 0 && $PC.vagina != -1>>blowing you a kiss<<else>>_hisA pussy already wet with anticipation<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<case "imp">>
 			"And I love to get fucked by futas till I'm too heavy to fly," _heA exclaims, rubbing _hisA belly and spreading _hisA legs.
 		<<case "witch">>
diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw
index 5a4547d74d02f78a6dce4fe985f2287c93cab1e5..67b99f1f02ef961d327900af54158a6ecfde52d6 100644
--- a/src/uncategorized/saChoosesOwnJob.tw
+++ b/src/uncategorized/saChoosesOwnJob.tw
@@ -286,13 +286,8 @@
 					<<set $slaves[$i].choosesOwnAssignmentText += " decides to get milked, since $he is already lactating.">>
 					<<= assignJob($slaves[$i], "get milked")>>
 				<</if>>
-<<<<<<< HEAD
-			<<elseif ($PC.dick >= 1) && isFertile($slaves[$i])>>
-				<<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > $masterSuiteSlaves)>>
-=======
 			<<elseif ($PC.dick != 0) && isFertile($slaves[$i])>>
 				<<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > _masterSL)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					<<set $slaves[$i].choosesOwnAssignmentText += " decides to serve you in $masterSuiteName, hoping that you'll get $him pregnant.">>
 					<<= assignJob($slaves[$i], "serve in the master suite")>>
 				<<else>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 1c5b77d66ca7de4f9075bc5968a70abde0353733..a74b566cec528676269c10cff77376f54dea2b2a 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -76,11 +76,7 @@
 				<<set $slaves[$i].sexualFlaw = "none">>
 			<</if>>
 		<<elseif $slaves[$i].fuckdoll <= 75>>
-<<<<<<< HEAD
-			This week $he @@.green;begins to learn more advanced commands@@ from $his suit. $He is taught a command that instructs $him to take a more active role in penetrative sex. When that command is given, $he must fuck $himself against any <<if $PC.dick >= 1>>cocks<<else>>phalli<</if>> that are currently inside $him, as hard as $he possibly can.
-=======
 			This week $he @@.green;begins to learn more advanced commands@@ from $his suit. $He is taught a command that instructs $him to take a more active role in penetrative sex. When that command is given, $he must fuck $himself against any <<if $PC.dick != 0>>cocks<<else>>phalli<</if>> that are currently inside $him, as hard as $he possibly can.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			<<if $slaves[$i].fetish != "none" && $slaves[$i].fetish != "mindbroken">>
 				$He @@.coral;no longer retains any sexual preferences@@ at all. $He just wants to be penetrated.
 				<<set $slaves[$i].fetish = "none", $slaves[$i].fetishStrength = 0>>
@@ -2534,11 +2530,7 @@
 						<<set $slaves[$i].fetishStrength -= 30>>
 					<</if>>
 				<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
-<<<<<<< HEAD
-					The bullet vibrator $he is wearing encourages many orgasms during <<if $PC.dick >= 1>>unprotected sex<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>loving contact with the female anatomy<</if>>, @@.lightcoral;$he begins to fantasize about pregnancy.@@
-=======
 					The bullet vibrator $he is wearing encourages many orgasms during <<if $PC.dick != 0>>unprotected sex<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>loving contact with the female anatomy<</if>>, @@.lightcoral;$he begins to fantasize about pregnancy.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					<<if _vAcc == "bullet vibrator" || _dAcc == "bullet vibrator">>
 						<<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
 					<<elseif _vAcc == "smart bullet vibrator" || _dAcc == "smart bullet vibrator">>
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index 21dcded633c264219e037ad3da0a398648260085..7b6720083fdf3a030d7b14f77846d294ff51a0d8 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -111,11 +111,7 @@ serves you this week.
 					<<= SkillIncrease.Vaginal($slaves[$i], _trainingEfficiency)>>
 				<</if>>
 			<</if>>
-<<<<<<< HEAD
-			<<if $PC.dick >= 1>>
-=======
 			<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<if ($slaves[$i].fetish != "mindbroken")>>
 					<<if $slaves[$i].fetish == "submissive">>
 						$He frequently climaxes with your <<if $PC.title == 1>>strong<<else>>soft<</if>> hands holding $him and your cock spreading heat through $his core,
@@ -247,11 +243,7 @@ serves you this week.
 				<</if>>
 				<<if $slaves[$i].fetish == "buttslut">>
 					<<if $slaves[$i].fetishKnown == 1>>
-<<<<<<< HEAD
-						$He @@.hotpink;takes great pleasure@@ in $his rear being used as your personal <<if $PC.dick >= 1>>cock holster<<else>>plaything<</if>>.
-=======
 						$He @@.hotpink;takes great pleasure@@ in $his rear being used as your personal <<if $PC.dick != 0>>cock holster<<else>>plaything<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 					<<else>>
 						$He @@.hotpink;seems to enjoy@@ anal sex more than the usual slave.
 					<</if>>
@@ -309,19 +301,11 @@ serves you this week.
 					$He usually has to fight for $his share of cum, making sure to milk cum from your urethra <<if $fuckSlaves > 1>>or suck it out of a pussy<</if>>.
 				<</if>>
 			<<else>>
-<<<<<<< HEAD
-				warming your bed and lavishing devoted attention on your <<if $PC.dick >= 1>>cock<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>pussy<</if>> with $his loving mouth.
-			<</if>>
-			You have the sexual energy to
-			<<if ($slaves[$i].fetish == "mindbroken")>>
-				<<if ($PC.dick >= 1)>>use $his mouth<<else>>make $him eat you out<</if>>
-=======
 				warming your bed and lavishing devoted attention on your <<if $PC.dick != 0>>cock<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>pussy<</if>> with $his loving mouth.
 			<</if>>
 			You have the sexual energy to
 			<<if ($slaves[$i].fetish == "mindbroken")>>
 				<<if ($PC.dick != 0)>>use $his mouth<<else>>make $him eat you out<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<if ($fuckSlaves <= $PC.sexualEnergy/2)>>
 					<<set _oralUse = random(21,40)>>
 					several times a day.
@@ -337,11 +321,7 @@ serves you this week.
 				<</if>>
 				$He absentmindedly follows your lead.
 			<<elseif ($slaves[$i].trust >= -20) && ($slaves[$i].devotion <= 20)>>
-<<<<<<< HEAD
-				<<if ($PC.dick >= 1)>>rape $his face<<else>>force $him to eat you out<</if>> $him
-=======
 				<<if ($PC.dick != 0)>>rape $his face<<else>>force $him to eat you out<</if>> $him
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				<<if ($fuckSlaves <= $PC.sexualEnergy/2)>>
 					<<set _oralUse = random(21,40)>>
 					several times a day; the constant
@@ -803,15 +783,6 @@ serves you this week.
 				reluctantly accepting your use of $his dick.
 			<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "submissive")>>
 				as your adoring submissive, seeing to your pleasure with $his shaft.
-<<<<<<< HEAD
-			<<elseif ($slaves[$i].devotion <= 50 && $PC.vagina >= 1)>>
-				obediently serving you in the classical way, driving into your womanhood.
-			<<elseif ($slaves[$i].devotion <= 50)>>
-				week obediently serving you by driving into your backdoor.
-			<<elseif $PC.vagina >= 1 && ($slaves[$i].career == "a breeding bull" || ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "pregnancy"))>>
-				eagerly driving $his cock into your pussy, thoroughly enjoying fucking pussy bareback and cumming deep inside.
-			<<elseif $PC.vagina >= 1>>
-=======
 			<<elseif ($slaves[$i].devotion <= 50 && $PC.vagina != -1)>>
 				obediently serving you in the classical way, driving into your womanhood.
 			<<elseif ($slaves[$i].devotion <= 50)>>
@@ -819,7 +790,6 @@ serves you this week.
 			<<elseif $PC.vagina != -1 && ($slaves[$i].career == "a breeding bull" || ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "pregnancy"))>>
 				eagerly driving $his cock into your pussy, thoroughly enjoying fucking pussy bareback and cumming deep inside.
 			<<elseif $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 				serving you in the classical way, warming your bed and lovingly driving $his shaft into your womanhood.
 			<<else>>
 				serving you in the classical way, warming your bed and lovingly driving $his shaft into your backdoor.
@@ -898,13 +868,8 @@ serves you this week.
 		<<set $slaves[$i].trust += 4>>
 
 	<<elseif ($slaves[$i].anus == 0) && ($slaves[$i].vagina == 0)>>
-<<<<<<< HEAD
-		Since you haven't yet decided to sell or take $his virginity or $his tight little anus, you let $him please you with $his mouth<<if $slaves[$i].nipples == "fuckable" && $PC.dick >= 1>> and tits<</if>>. $He is @@.mediumaquamarine;duly grateful@@ you let $him keep $his innocence for another week, though $his
-		<<if $slaves[$i].nipples == "fuckable" && $PC.dick >= 1>>
-=======
 		Since you haven't yet decided to sell or take $his virginity or $his tight little anus, you let $him please you with $his mouth<<if $slaves[$i].nipples == "fuckable" && $PC.dick != 0>> and tits<</if>>. $He is @@.mediumaquamarine;duly grateful@@ you let $him keep $his innocence for another week, though $his
 		<<if $slaves[$i].nipples == "fuckable" && $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			throat and breasts get a little sore picking up the slack.
 		<<else>>
 			throat gets a little sore doing the work of three holes.
@@ -913,19 +878,11 @@ serves you this week.
 
 	<<elseif ($slaves[$i].vagina == 0)>>
 		Since you haven't yet decided to sell or take $his virginity, you let $him confine $his efforts to $his
-<<<<<<< HEAD
-		<<if canDoAnal($slaves[$i]) && $slaves[$i].nipples == "fuckable" && $PC.dick >= 1>>
-			anus, nipples and mouth. $He is @@.mediumaquamarine;duly grateful@@ you let $his keep $his innocence for another week, though $his butt, boobs and throat get a little sore.
-		<<elseif canDoAnal($slaves[$i])>>
-			anus and mouth. $He is @@.mediumaquamarine;duly grateful@@ you let $his keep $his innocence for another week, though $his butt and throat get a little sore.
-		<<elseif $slaves[$i].nipples == "fuckable" && $PC.dick >= 1>>
-=======
 		<<if canDoAnal($slaves[$i]) && $slaves[$i].nipples == "fuckable" && $PC.dick != 0>>
 			anus, nipples and mouth. $He is @@.mediumaquamarine;duly grateful@@ you let $his keep $his innocence for another week, though $his butt, boobs and throat get a little sore.
 		<<elseif canDoAnal($slaves[$i])>>
 			anus and mouth. $He is @@.mediumaquamarine;duly grateful@@ you let $his keep $his innocence for another week, though $his butt and throat get a little sore.
 		<<elseif $slaves[$i].nipples == "fuckable" && $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			nipples and mouth. $He is @@.mediumaquamarine;duly grateful@@ you let $his keep $his innocence for another week, though $his boobs and throat get a little sore.
 		<<else>>
 			mouth. $He is @@.mediumaquamarine;duly grateful@@ you let $his keep $his innocence for another week, though $his throat gets a little sore.
@@ -934,19 +891,11 @@ serves you this week.
 
 	<<elseif ($slaves[$i].anus == 0)>>
 		Since you haven't yet decided to sell or take $his tight little anus, you let $him confine $his efforts to $his
-<<<<<<< HEAD
-		<<if canDoVaginal($slaves[$i]) && $slaves[$i].nipples == "fuckable" && $PC.dick >= 1>>
-			pussy, nipples and mouth. $He is @@.mediumaquamarine;duly grateful@@ you let $him put off taking it up the butt another week, though $his boobs and throat get a little sore.
-		<<elseif canDoVaginal($slaves[$i])>>
-			pussy and mouth. $He is @@.mediumaquamarine;duly grateful@@ you let $him put off taking it up the butt another week, though $his throat gets a little sore.
-		<<elseif $slaves[$i].nipples == "fuckable" && $PC.dick >= 1>>
-=======
 		<<if canDoVaginal($slaves[$i]) && $slaves[$i].nipples == "fuckable" && $PC.dick != 0>>
 			pussy, nipples and mouth. $He is @@.mediumaquamarine;duly grateful@@ you let $him put off taking it up the butt another week, though $his boobs and throat get a little sore.
 		<<elseif canDoVaginal($slaves[$i])>>
 			pussy and mouth. $He is @@.mediumaquamarine;duly grateful@@ you let $him put off taking it up the butt another week, though $his throat gets a little sore.
 		<<elseif $slaves[$i].nipples == "fuckable" && $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 			nipples and mouth. $He is @@.mediumaquamarine;duly grateful@@ you let $him put off taking it up the butt another week, though $his boobs and throat get a little sore.
 		<<else>>
 			mouth. $He is @@.mediumaquamarine;duly grateful@@ you let $him put off taking it up the butt another week, though $his throat gets a little sore.
@@ -982,15 +931,6 @@ serves you this week.
 	<<elseif ($slaves[$i].devotion > 50)>>
 		$He devotedly accompanies you all week, keeping $his
 		<<if canDoAnal($slaves[$i]) && canDoVaginal($slaves[$i])>>
-<<<<<<< HEAD
-			mouth, vagina<<if $PC.dick >= 1 && $slaves[$i].nipples == "fuckable">>, nipples<</if>> and asshole
-		<<elseif ($slaves[$i].vagina == -1) && canDoAnal($slaves[$i])>>
-			mouth<<if $PC.dick >= 1 && $slaves[$i].nipples == "fuckable">>, nipples<</if>> and asshole
-		<<elseif ($slaves[$i].vagina > -1) && !canDoVaginal($slaves[$i]) && canDoAnal($slaves[$i])>>
-			mouth<<if $PC.dick >= 1 && $slaves[$i].nipples == "fuckable">>, nipples<</if>> and, since $his pussy is covered by $his chastity belt, asshole
-		<<else>>
-			mouth<<if $PC.dick >= 1 && $slaves[$i].nipples == "fuckable">>and nipples<</if>>
-=======
 			mouth, vagina<<if $PC.dick != 0 && $slaves[$i].nipples == "fuckable">>, nipples<</if>> and asshole
 		<<elseif ($slaves[$i].vagina == -1) && canDoAnal($slaves[$i])>>
 			mouth<<if $PC.dick != 0 && $slaves[$i].nipples == "fuckable">>, nipples<</if>> and asshole
@@ -998,7 +938,6 @@ serves you this week.
 			mouth<<if $PC.dick != 0 && $slaves[$i].nipples == "fuckable">>, nipples<</if>> and, since $his pussy is covered by $his chastity belt, asshole
 		<<else>>
 			mouth<<if $PC.dick != 0 && $slaves[$i].nipples == "fuckable">>and nipples<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<</if>>
 		available for you at all times.
 		<<if canAchieveErection($slaves[$i]) && !($slaves[$i].chastityPenis)>>
@@ -1362,20 +1301,12 @@ Keeping $him as nothing but your personal
 		<<set $slaves[$i].trust += 1>>
 	<</if>>
 	<<if ($slaves[$i].behavioralQuirk == "adores men")>>
-<<<<<<< HEAD
-		<<if ($PC.dick >= 1)>>
-=======
 		<<if ($PC.dick != 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		$slaves[$i].slaveName @@.hotpink;adores your company,@@ and is happy to spend time with you, even when you don't have your cock in $him.
 		<<set $slaves[$i].devotion += 1>>
 		<</if>>
 	<<elseif ($slaves[$i].behavioralQuirk == "adores women")>>
-<<<<<<< HEAD
-		<<if ($PC.vagina >= 1)>>
-=======
 		<<if ($PC.vagina != -1)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		$slaves[$i].slaveName @@.hotpink;adores your company,@@ and is happy to spend time with you, even when you aren't fucking.
 		<<set $slaves[$i].devotion += 1>>
 		<</if>>
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index 9d65097534e70d8fe8e1d1c1a3200bf5f4e6ea46..6a2bd29a2da6a805d73904bd0346d4b5d0b60ec2 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -181,11 +181,7 @@ Your arcology has gained a well-off citizen.
 	<<if (_clonedSlave.fetish == "submissive") && (_clonedSlave.fetishKnown == 1)>>
 		Taking the lead as you know $he prefers, you lead $him to a private booth and make love to $him, holding $him down with the gentle but firm grip that never fails to bring $him through a long and gasping climax.
 	<<elseif (_clonedSlave.fetish == "cumslut") && (_clonedSlave.fetishKnown == 1)>>
-<<<<<<< HEAD
-		$He <<if $PC.dick >= 1>>sucks your dick<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eats you out<</if>> right there, eagerly <<if _clonedSlave.vagina > -1>>jilling off<<else>>jacking off<</if>> as $he enjoys your infinitely familiar
-=======
 		$He <<if $PC.dick != 0>>sucks your dick<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eats you out<</if>> right there, eagerly <<if _clonedSlave.vagina > -1>>jilling off<<else>>jacking off<</if>> as $he enjoys your infinitely familiar
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<if canTaste(_clonedSlave) && canSmell(_clonedSlave)>>
 			taste and scent.
 		<<elseif canTaste(_clonedSlave)>>
@@ -198,19 +194,11 @@ Your arcology has gained a well-off citizen.
 	<<elseif (_clonedSlave.fetish == "humiliation") && (_clonedSlave.fetishKnown == 1)>>
 		You take $him right there, the humiliation slut getting what $he came to the club to get: an opportunity to orgasm in public with many eyes enjoying the sight of $his pleasure.
 	<<elseif (_clonedSlave.fetish == "buttslut") && (_clonedSlave.fetishKnown == 1)>>
-<<<<<<< HEAD
-		Your <<if $PC.dick >= 1>>dick is<<else>>fingers are<</if>> up $his ass in no time, and $he's so primed for anal that $he climaxes with indecent speed. $He begs you to keep fucking $his butt, and you do.
-	<<elseif (_clonedSlave.fetish == "boobs") && (_clonedSlave.fetishKnown == 1)>>
-		$He grinds shamelessly against you, your hands holding $his breasts just the way you know $he loves them held. Your <<if $PC.boobs >= 1>>own tits press softly<<else>>manly chest presses<</if>> against $his back as $he cranes back to kiss you.
-	<<elseif (_clonedSlave.fetish == "pregnancy") && (_clonedSlave.fetishKnown == 1)>>
-		$He begs shamelessly for your seed, right here and right now, and <<if $PC.dick >= 1>>you give it to $him, producing the usual perverted orgasm as $he feels it inside $him.<<else>>as usual, $he doesn't care that the phallus you fuck $him with is actually a strap-on. $He manages to pretend it's a cock knocking $him up.<</if>>
-=======
 		Your <<if $PC.dick != 0>>dick is<<else>>fingers are<</if>> up $his ass in no time, and $he's so primed for anal that $he climaxes with indecent speed. $He begs you to keep fucking $his butt, and you do.
 	<<elseif (_clonedSlave.fetish == "boobs") && (_clonedSlave.fetishKnown == 1)>>
 		$He grinds shamelessly against you, your hands holding $his breasts just the way you know $he loves them held. Your <<if $PC.boobs >= 300>>own tits press softly<<elseif $PC.title == 0>>flat chest presses<<else>>manly chest presses<</if>> against $his back as $he cranes back to kiss you.
 	<<elseif (_clonedSlave.fetish == "pregnancy") && (_clonedSlave.fetishKnown == 1)>>
 		$He begs shamelessly for your seed, right here and right now, and <<if $PC.dick != 0>>you give it to $him, producing the usual perverted orgasm as $he feels it inside $him.<<else>>as usual, $he doesn't care that the phallus you fuck $him with is actually a strap-on. $He manages to pretend it's a cock knocking $him up.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<elseif (_clonedSlave.fetish == "dom") && (_clonedSlave.fetishKnown == 1)>>
 		After some mutually aggressive dancing that leaves you both panting and sweaty, you work together to attract another free dancer, a _girlU who _clonedSlave.slaveName had $his eye on already. Before long, the poor _girlU is screaming with orgasm in a private booth as you take _himU together.
 	<<elseif (_clonedSlave.fetish == "sadist") && (_clonedSlave.fetishKnown == 1)>>
diff --git a/src/uncategorized/seWeddingDouble.tw b/src/uncategorized/seWeddingDouble.tw
index ede219a8429f5c060c370f6aa4ac72cb9641f0d6..8f410cef652f53635cd1998b6dba6ba9d59b9be3 100644
--- a/src/uncategorized/seWeddingDouble.tw
+++ b/src/uncategorized/seWeddingDouble.tw
@@ -1486,11 +1486,7 @@
 			There is no ring for you, since this marriage does not bind you.
 			<br><br>
 			/* TODO: marked for rewrite */
-<<<<<<< HEAD
-			Once the ceremony is complete, you scoop up your new slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> to carry them back into the master bedroom. They rest their heads against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle them in your arms, and by the time they're home, they're fast asleep. You set them gently down on the bed and curl up behind them, feeling the animal warmth of their bodies as the exhausted slaves' chest rise and fall with their breathing.
-=======
 			Once the ceremony is complete, you scoop up your new slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> to carry them back into the master bedroom. They rest their heads against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle them in your arms, and by the time they're home, they're fast asleep. You set them gently down on the bed and curl up behind them, feeling the animal warmth of their bodies as the exhausted slaves' chest rise and fall with their breathing.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<elseif _slave1.devotion+_slave1.trust >= 175>>
 			/* TODO: rewrite for slaves that can't walk */
 			They spent the day before resting and preparing themselves, and this was a necessary precaution. They spend most of the day-long party at the center of a nonstop gangbang. The theory is that they'll be bound to you as your slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> from this day onward, so they must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, @@.green;your guests take part with enthusiasm,@@ many having brought their own slaves to participate, too. _slave1.slaveName and _slave2.slaveName spend hours with numerous cocks inside them, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, they're extracted and taken off to be bathed.
@@ -1518,11 +1514,7 @@
 			There is no ring for you, since this marriage does not bind you.
 			<br><br>
 			/* TODO: marked for rewrite */
-<<<<<<< HEAD
-			Once the ceremony is complete, you scoop up your new slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> to carry them back into the master bedroom. They rest their heads against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle them in your arms, and by the time they're home, they're fast asleep. You set them gently down on the bed and curl up behind them, feeling the animal warmth of their bodies as the exhausted slave's chest rises and falls with their breathing.
-=======
 			Once the ceremony is complete, you scoop up your new slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> to carry them back into the master bedroom. They rest their heads against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle them in your arms, and by the time they're home, they're fast asleep. You set them gently down on the bed and curl up behind them, feeling the animal warmth of their bodies as the exhausted slave's chest rises and falls with their breathing.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<elseif _slave1.devotion < -20 && _slave1.trust > 20>>
 			/* TODO: rewrite for slaves that can't walk */
 			They spent the day before resting and trying to ready themselves, and this was a necessary precaution. They spend most of the day-long party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that they'll be bound to you as your slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> from this day onward, so they must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. _slave1.slaveName and _slave2.slaveName spend hours with numerous cocks inside them, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, they're extracted and taken off to be bathed.
@@ -1578,11 +1570,7 @@
 			There is no ring for you, since this marriage does not bind you.
 			<br><br>
 			/* TODO: marked for rewrite */
-<<<<<<< HEAD
-			Once the ceremony is complete, you scoop up your new slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> to carry them back into the master bedroom. They rest their head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time they're home, they're fast asleep. You set them gently down on the bed and curl up behind them, feeling the animal warmth of their bodies as the exhausted slaves' chest rise and fall with their breathing.
-=======
 			Once the ceremony is complete, you scoop up your new slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> to carry them back into the master bedroom. They rest their head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time they're home, they're fast asleep. You set them gently down on the bed and curl up behind them, feeling the animal warmth of their bodies as the exhausted slaves' chest rise and fall with their breathing.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<else>>
 			/* TODO: rewrite for slaves that can't walk */
 			They spent the day before resting and reluctantly preparing themselves, and this was a necessary precaution. They spend most of the day-long party at the center of a nonstop gangbang, moaning and wincing as they takes cock after cock. The theory is that they'll be bound to you as your slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> from this day onward, so they must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's lack of passion. Many brought their own slaves to participate, too. _slave1.slaveName and _slave2.slaveName spend hours with numerous cocks inside them, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, they're extracted and taken off to be bathed.
@@ -1627,31 +1615,19 @@
 			<br><br>
 			$He returns shortly, looking exhausted but rather proud of $himself for getting through all that. $He's naked still, $his skin clean and _slave1.skin, and comes confidently to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well-traveled, and $his tiredness. $He does $his best to conceal how ready to sleep $he is, but $he leans against you a little. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms(_slave1)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 			<br><br>
-<<<<<<< HEAD
-			Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
-=======
 			Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<elseif _slave1.devotion < -20 && _slave1.trust > 20>>
 			_slave1.slaveName spent the day before resting and trying to ready $himself, and this was a necessary precaution. $He spends most of the day-long party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. _slave1.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 			<br><br>
 			$He returns shortly, looking exhausted and annoyed. $He's naked still, $his skin clean and _slave1.skin, and comes reluctantly to stand by you for the ceremony, glaring at you the whole time. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness and look stronger than $he is, choosing to struggle to stand instead of leaning against you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms(_slave1)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 			<br><br>
-<<<<<<< HEAD
-			Once the ceremony is complete, you scoop up your new, protesting, slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing. $He squirms slightly in $his sleep to the unwelcome feeling of your arm around $him.
-=======
 			Once the ceremony is complete, you scoop up your new, protesting, slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing. $He squirms slightly in $his sleep to the unwelcome feeling of your arm around $him.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<elseif _slave1.devotion < -20>>
 			_slave1.slaveName spent the day before resting and crying to $himself, and this was a necessary precaution. $He spends most of the day-long party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. _slave1.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 			<br><br>
 			$He returns shortly, looking exhausted and depressed. $He's naked still, $his skin clean and _slave1.skin, and comes reluctantly to stand by you for the ceremony, just wanting it to be over. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness out of fear of punishment, and $he leans against you for support despite $his feelings on the wedding and you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms(_slave1)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 			<br><br>
-<<<<<<< HEAD
-			Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
-=======
 			Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<else>>
 			_slave1.slaveName spent the day before resting and reluctantly preparing $himself, and this was a necessary precaution. $He spends most of the day-long party at the center of a nonstop gangbang, moaning and wincing as $he takes cock after cock. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's lack of passion. Many brought their own slaves to participate, too. _slave1.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 			<br><br>
@@ -1683,11 +1659,7 @@
 			<br><br>
 			_He2 returns shortly, looking exhausted and depressed. _He2's naked still, _his2 skin clean and _slave2.skin, and comes reluctantly to stand by you for the ceremony, just wanting it to be over. The only evident signs that _he2's had sex with more than a hundred people today is _his2 ass, which looks rather well traveled, and _his2 tiredness. _He2 does _his2 best to conceal _his2 tiredness out of fear of punishment, and _he2 leans against you for support despite _his2 feelings on the wedding and you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for _him2, and you place a simple steel ring <<if !hasAnyArms(_slave2)>>on a cord around _his2 neck, since _he2 lacks fingers to wear it on<<else>>on _his2 finger<</if>>. There is no ring for you, since this marriage does not bind you.
 			<br><br>
-<<<<<<< HEAD
-			Once the ceremony is complete, you scoop up your new slave _wife2 to carry _him2 back into the master bedroom. _He2 rests _his2 head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time _he2's home, _he2's fast asleep. You set _him2 gently down on the bed and curl up behind _him2, feeling the animal warmth of _his2 body as the exhausted slave's chest rises and falls with _his2 breathing.
-=======
 			Once the ceremony is complete, you scoop up your new slave _wife2 to carry _him2 back into the master bedroom. _He2 rests _his2 head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time _he2's home, _he2's fast asleep. You set _him2 gently down on the bed and curl up behind _him2, feeling the animal warmth of _his2 body as the exhausted slave's chest rises and falls with _his2 breathing.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<<else>>
 			spent the day before resting and reluctantly preparing _himself2, and this was a necessary precaution. _He2 spends most of the day-long party at the center of a nonstop gangbang, moaning and wincing as _he2 takes cock after cock. The theory is that _he2'll be bound to you as your slave _wife2 from this day onward, so _he2 must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's lack of passion. Many brought their own slaves to participate, too. _slave2.slaveName spends hours with numerous cocks inside _him2, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, _he2's extracted and taken off to be bathed.
 			<br><br>
diff --git a/src/uncategorized/seWeddingTriple.tw b/src/uncategorized/seWeddingTriple.tw
index 27f52f3b96319fe5921a0c28fad01f2c93ee20d5..cf1b20b2059ef408dc91b8015077d66262264b29 100644
--- a/src/uncategorized/seWeddingTriple.tw
+++ b/src/uncategorized/seWeddingTriple.tw
@@ -75,21 +75,13 @@ In the days leading up to your wedding, your <<if $wife == _wife2>>$wives<<else>
 		<br><br>
 		$He returns shortly, looking exhausted but otherwise uncaring. $He's naked still, $his skin clean and $activeSlave.skin, and is led to you for the ceremony by another slave. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He can't conceal $his tiredness, and leans against you subconsciously. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($activeSlave)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 		<br><br>
-<<<<<<< HEAD
-		Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
-=======
 		Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
 		$He spent the day before resting and preparing $himself, and this was a necessary precaution. $He spends most of the day-long party at the center of a nonstop gangbang. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, @@.green;your guests take part with enthusiasm,@@ many having brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 		<br><br>
 		$He returns shortly, looking exhausted but rather proud of $himself for getting through all that. $He's naked still, $his skin clean and $activeSlave.skin, and comes confidently to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well-traveled, and $his tiredness. $He does $his best to conceal how ready to sleep $he is, but $he leans against you a little. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($activeSlave)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 		<br><br>
-<<<<<<< HEAD
-		Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
-=======
 		Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 	<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
 		$He spent the day before resting and trying to ready $himself, and this was a necessary precaution. $He spends most of the day-long party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 		<br><br>
diff --git a/src/uncategorized/shops.tw b/src/uncategorized/shops.tw
index 92473ab12a34ea82fbeefb78545f2b0d6e321447..8b5e83f6905091ff93ecdf32238fae0f4c229760 100644
--- a/src/uncategorized/shops.tw
+++ b/src/uncategorized/shops.tw
@@ -73,11 +73,7 @@ This is a section of the promenade
 <<case "Repopulationist">>
 	<<setPlayerPronouns>>
 	dedicated to Repopulationism. The shops here offer a lovely mix of sex toys, fertility agents, maternity wear and furniture to fit even the biggest pregnancy. An attractive slave salesgirl with a huge belly is demonstrating the proper use of a swing designed to accommodate _hisU added heft to a female citizen just beginning to show and her curious husband.
-<<<<<<< HEAD
-	<span id="result"><<link "Give the swing a try">><<replace "#result">>You wait for the couple to leave before approaching the hapless _girlU and placing a hand on _hisU vulnerable middle. _HeU squeaks in surprise before _heU realizes just who is browsing _hisU toys and the goods between _hisU legs. <<if $PC.belly >= 5000>>Spreading _hisU legs, you find that _heU is suspended at the perfect height for you to comfortably penetrate _himU; or _heU would be, if your own rounded middle wasn't pushing into _hisU own. _HeU asks for a little help getting down, and afterwards, shows you to a series of harnesses designed to hold a _girlU with _hisU belly dangling beneath _himU. The perfect toy for the very pregnant slaveowner hoping to plow _hisP equally gravid chattel.<<elseif $PC.dick >= 1>>Spreading _hisU legs, you find that _heU is suspended at the perfect height for you to comfortably penetrate _himU.<<else>> Picking out an attractive strap-on, donning it, and spreading _hisU legs, you find that _heU is suspended at the perfect height for you to comfortably penetrate _himU.<</if>> Even better, the swing handles _hisU weight, so no sprained back!<</replace>><</link>></span>
-=======
 	<span id="result"><<link "Give the swing a try">><<replace "#result">>You wait for the couple to leave before approaching the hapless _girlU and placing a hand on _hisU vulnerable middle. _HeU squeaks in surprise before _heU realizes just who is browsing _hisU toys and the goods between _hisU legs. <<if $PC.belly >= 5000>>Spreading _hisU legs, you find that _heU is suspended at the perfect height for you to comfortably penetrate _himU; or _heU would be, if your own rounded middle wasn't pushing into _hisU own. _HeU asks for a little help getting down, and afterwards, shows you to a series of harnesses designed to hold a _girlU with _hisU belly dangling beneath _himU. The perfect toy for the very pregnant slaveowner hoping to plow _hisP equally gravid chattel.<<elseif $PC.dick != 0>>Spreading _hisU legs, you find that _heU is suspended at the perfect height for you to comfortably penetrate _himU.<<else>> Picking out an attractive strap-on, donning it, and spreading _hisU legs, you find that _heU is suspended at the perfect height for you to comfortably penetrate _himU.<</if>> Even better, the swing handles _hisU weight, so no sprained back!<</replace>><</link>></span>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 <<case "Eugenics">>
 	dedicated to Eugenics. You knew the individuals drawn into your society had connections, but you had no idea they were this extensive! If you can think of it, a shop here is selling it; though they are not cheap, only the finest available merchandise is for sale here. Numerous recognizable faces browse the storefronts, accompanied by their favorite chattel, and upon noticing you, vie for your valuable attention.
 	<<if $PC.preg > 20 && ($PC.pregSource == -1 || $PC.pregSource == -6)>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index a700293298fe6059b1d152c0218aeede468f884c..16d65537251b741fbb0f43fbdb46556238f0b426 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -607,11 +607,7 @@ As the remote surgery's long recovery cycle completes,
 		$He does not understand the realities of $his life as a slave at a core level, so $he's @@.mediumorchid;terrified and angry@@ that you have forced $him to be a broodmother. As with all surgery @@.red;$his health has been slightly affected.@@ $He is @@.gold;sensibly fearful@@ of your total power over $his body and $his rapidly filling womb.
 		<<set $activeSlave.trust -= 15, $activeSlave.devotion -= 15>>
 	<</if>>
-<<<<<<< HEAD
-	<<if $PC.dick >= 1>>
-=======
 	<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
 		<span id="seed">
 		<br><br>
 		The implant is highly receptive to fresh sperm right now; it would be trivial to seed it with yours and force $him to bear hundreds of your children.