From 4927b44fd6cee803b1297be0cc4fe942c054794f Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Mon, 25 Feb 2019 20:11:05 -0600
Subject: [PATCH] haha oops

---
 src/uncategorized/RETS.tw             | 7 +------
 src/uncategorized/reAnalPunishment.tw | 6 +-----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index b8990e496a5..24e17dc73e0 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -1206,13 +1206,8 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 <<link "Make sure $he looks after $his bottom">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-	You tell $him you'll inspect $him after $he's done, but add that $subSlave.slaveName is clearly being a very good little anal slut, and _he2 deserves to be rewarded. Hearing this, $subSlave.slaveName @@.hotpink;looks at you very gratefully,@@ and mouths a quiet thanks. "Ye<<s>> <<Master>>!" comes the response. $activeSlave.slaveName shifts $his bitch to one side, and cranes $his head upward to make out with the compliant slave. $subSlave.slaveName kisses $him back with gusto, surprising $activeSlave.slaveName again. $He recoils in shock at how much tongue $subSlave.slaveName gives $him, but moans aggressively and gets $his revenge by dropping one of $subSlave.slaveName's knees and
-	<<if ($subSlave.chastityPenis)>>
-=======
 	You tell $him you'll inspect $him after $he's done, but add that $subSlave.slaveName is clearly being a very good little anal slut, and _he2 deserves to be rewarded. <<if canHear($subSlave)>>Hearing<<else>>Learning<</if>> this, $subSlave.slaveName @@.hotpink;looks at you very gratefully,@@ and mouths a quiet thanks. "Ye<<s>> <<Master>>!" comes the response. $activeSlave.slaveName shifts $his bitch to one side, and cranes $his head upward to make out with the compliant slave. $subSlave.slaveName kisses $him back with gusto, surprising $activeSlave.slaveName again. $He recoils in shock at how much tongue $subSlave.slaveName gives $him, but moans aggressively and gets $his revenge by dropping one of $subSlave.slaveName's knees and
-	<<if ["chastity", "combined chastity"].includes($subSlave.dickAccessory)>>
->>>>>>> f215c367152488e3920e17f5135afccb2a8b0bff
+	<<if ($subSlave.chastityPenis)>>
 		playing with one of _his2 nipples.
 	<<elseif canAchieveErection($subSlave)>>
 		jacking _him2 off.
diff --git a/src/uncategorized/reAnalPunishment.tw b/src/uncategorized/reAnalPunishment.tw
index 647a846406f..34b09b76bf3 100644
--- a/src/uncategorized/reAnalPunishment.tw
+++ b/src/uncategorized/reAnalPunishment.tw
@@ -48,11 +48,7 @@ $HeadGirl.slaveName is very much acting within _his2 duties, and $activeSlave.sl
 <br><<link "Take part">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-<<<<<<< HEAD
-	You explain $activeSlave.slaveName's double crime to $him, and tell $HeadGirl.slaveName to get started. Your Head Girl orders the weeping slave to present $his anus. The <<if $activeSlave.physicalAge > 30>>woman<<else>>girl<</if>> does not resist, but neither does $he comply. $HeadGirl.slaveName jabs a thumb into $activeSlave.slaveName's side, right above $his kidney, driving the wind out of the slave with a pained grunt. $He arches $his back involuntarily and $his grip on you loosens, so $HeadGirl.slaveName drags $him off you, telling $activeSlave.slaveName that it'll hurt less if $he cooperates and assumes the proper position. $He doesn't, so $HeadGirl.slaveName assfucks $him lying flat on the floor, with the poor $girl sobbing loudly as $HeadGirl.slaveName <<if ($HeadGirl.dick > 2) && canAchieveErection($HeadGirl) && !($HeadGirl.chastityPenis)>>pistons _his2 cock in and out of $his rectum<<else>>rams the massive dildo up $his butt<</if>>.
-=======
-	You explain $activeSlave.slaveName's double crime to $him, and tell $HeadGirl.slaveName to get started. Your Head Girl orders the weeping slave to present $his anus. The <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>> does not resist, but nor does $he comply. $HeadGirl.slaveName jabs a thumb into $activeSlave.slaveName's side, right above $his kidney, driving the wind out of the slave with a pained grunt. $He arches $his back involuntarily and $his grip on you loosens, so $HeadGirl.slaveName drags $him off you, telling $activeSlave.slaveName that it'll hurt less if $he cooperates and assumes the proper position. $He doesn't, so $HeadGirl.slaveName assfucks $him lying flat on the floor, with the poor $girl sobbing loudly as $HeadGirl.slaveName <<if ($HeadGirl.dick > 2) && canAchieveErection($HeadGirl) && ($HeadGirl.dickAccessory != "chastity") && ($HeadGirl.dickAccessory != "combined chastity")>>pistons _his2 cock in and out of $his rectum<<else>>rams the massive dildo up $his butt<</if>>.
->>>>>>> f215c367152488e3920e17f5135afccb2a8b0bff
+	You explain $activeSlave.slaveName's double crime to $him, and tell $HeadGirl.slaveName to get started. Your Head Girl orders the weeping slave to present $his anus. The <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>> does not resist, but nor does $he comply. $HeadGirl.slaveName jabs a thumb into $activeSlave.slaveName's side, right above $his kidney, driving the wind out of the slave with a pained grunt. $He arches $his back involuntarily and $his grip on you loosens, so $HeadGirl.slaveName drags $him off you, telling $activeSlave.slaveName that it'll hurt less if $he cooperates and assumes the proper position. $He doesn't, so $HeadGirl.slaveName assfucks $him lying flat on the floor, with the poor $girl sobbing loudly as $HeadGirl.slaveName <<if ($HeadGirl.dick > 2) && canAchieveErection($HeadGirl) && !($HeadGirl.chastityPenis)>>pistons _his2 cock in and out of $his rectum<<else>>rams the massive dildo up $his butt<</if>>.
 	<br><br>
 	After enjoying the spectacle for a while, you judge that the slave's sphincter is loose enough and tell $HeadGirl.slaveName to flip the bitch over. @@.hotpink;_He2 obeys, chuckling,@@ sitting _himself2 down and hauling the reluctant slave onto _his2 lap by seizing a nipple and pulling it into position so the agonized slave is forced to follow. <<if ($HeadGirl.dick > 2) && canAchieveErection($HeadGirl) && !($HeadGirl.chastityPenis)>>$HeadGirl.slaveName reinserts _his2 dick, <<else>>$HeadGirl.slaveName maneuvers the dildo down over _his2 own crotch, approximating the position of a natural cock and using its base to stimulate _himself2. _He2 reinserts it,<</if>> intentionally missing twice to keep the experience unpleasant despite _his2 victim's well-fucked backdoor.
 	<br><br>
-- 
GitLab