diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index eae2edffcefedc1e1394efba2ea354c004351fb5..6c2c9e2c625b0a9da485770f695e9c52f8770c31 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -2205,6 +2205,17 @@
 						[[Induced superfetation treatment|Surgery Degradation][getSlave($AS).geneticQuirks.superfetation = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 40,$surgeryType = "gene treatment"]] <span class="note">This will induce <span class="orange">superfetation</span> in $his genetic code</span>
 					<</if>>
 				</div>
+				
+				<div>
+					<<if getSlave($AS).geneticQuirks.uterineHypersensitivity == 2>>
+						[[Correct super uterine hypersensitivity|Surgery Degradation][getSlave($AS).geneticQuirks.uterineHypersensitivity = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 100,$surgeryType = "gene treatment"]]
+					<<elseif getSlave($AS).geneticQuirks.uterineHypersensitivity == 1 && $geneticMappingUpgrade >= 2>>
+						[[Uterine hypersensitivity activation treatment|Surgery Degradation][getSlave($AS).geneticQuirks.uterineHypersensitivity = 2,cashX(forceNeg($surgeryCost*4), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 100,$surgeryType = "gene treatment"]]
+						| [[Uterine hypersensitivity carrier corrective treatment|Surgery Degradation][getSlave($AS).geneticQuirks.uterineHypersensitivity = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 100,$surgeryType = "gene treatment"]]
+					<<elseif $geneticFlawLibrary == 1>>
+						[[Induced uterine hypersensitivity treatment|Surgery Degradation][getSlave($AS).geneticQuirks.uterineHypersensitivity = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 100,$surgeryType = "gene treatment"]] <span class="note">This will induce <span class="orange">uterine hypersensitivity</span> in $his genetic code</span>
+					<</if>>
+				</div>
 
 				<div>
 					<<if getSlave($AS).geneticQuirks.gigantomastia >= 2>>
@@ -2217,22 +2228,6 @@
 					<</if>>
 				</div>
 
-<<<<<<< HEAD
-			<div>
-				<<if getSlave($AS).geneticQuirks.mLoss == 2>>
-					[[Correct myotonic dystrophy|Surgery Degradation][getSlave($AS).geneticQuirks.mLoss = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 100,$surgeryType = "gene treatment"]]
-				<<elseif getSlave($AS).geneticQuirks.mLoss == 1 && $geneticMappingUpgrade >= 2>>
-					[[Myotonic dystrophy activation treatment|Surgery Degradation][getSlave($AS).geneticQuirks.mLoss = 2,cashX(forceNeg($surgeryCost*4), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 100,$surgeryType = "gene treatment"]]
-					| [[Myotonic dystrophy carrier corrective treatment|Surgery Degradation][getSlave($AS).geneticQuirks.mLoss = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 100,$surgeryType = "gene treatment"]]
-				<<elseif $geneticFlawLibrary == 1>>
-					[[Induced myotonic dystrophy treatment|Surgery Degradation][getSlave($AS).geneticQuirks.mLoss = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 40,$surgeryType = "gene treatment"]] <span class="note">This will induce <span class="orange">myotonic dystrophy</span> in $his genetic code</span>
-				<</if>>
-			</div>
-		<</if>>
-	<</if>>
-</div>
-</div>
-=======
 				<div>
 					<<if getSlave($AS).geneticQuirks.macromastia >= 2>>
 						[[Correct macromastia|Surgery Degradation][getSlave($AS).geneticQuirks.macromastia = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 100,$surgeryType = "gene treatment"]]
@@ -2243,7 +2238,6 @@
 						[[Induced macromastia treatment|Surgery Degradation][getSlave($AS).geneticQuirks.macromastia = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 40,$surgeryType = "gene treatment"]] <span class="note">This will induce <span class="orange">macromastia</span> in $his genetic code</span>
 					<</if>>
 				</div>
->>>>>>> upstream/pregmod-master
 
 				<div>
 					<<if getSlave($AS).geneticQuirks.rearLipedema == 2>>
@@ -2289,17 +2283,6 @@
 					<</if>>
 				</div>
 
-				<div>
-					<<if getSlave($AS).geneticQuirks.uterineHypersensitivity == 2>>
-						[[Correct super uterine hypersensitivity|Surgery Degradation][getSlave($AS).geneticQuirks.uterineHypersensitivity = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 100,$surgeryType = "gene treatment"]]
-					<<elseif getSlave($AS).geneticQuirks.uterineHypersensitivity == 1 && $geneticMappingUpgrade >= 2>>
-						[[Uterine hypersensitivity activation treatment|Surgery Degradation][getSlave($AS).geneticQuirks.uterineHypersensitivity = 2,cashX(forceNeg($surgeryCost*4), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 100,$surgeryType = "gene treatment"]]
-						| [[Uterine hypersensitivity carrier corrective treatment|Surgery Degradation][getSlave($AS).geneticQuirks.uterineHypersensitivity = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 100,$surgeryType = "gene treatment"]]
-					<<elseif $geneticFlawLibrary == 1>>
-						[[Induced uterine hypersensitivity treatment|Surgery Degradation][getSlave($AS).geneticQuirks.uterineHypersensitivity = 2,cashX(forceNeg($surgeryCost*10), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 100,$surgeryType = "gene treatment"]] <span class="note">This will induce <span class="orange">uterine hypersensitivity</span> in $his genetic code</span>
-					<</if>>
-				</div>
-				
 				<div>
 					<<if getSlave($AS).geneticQuirks.mGain == 2>>
 						[[Correct myotonic hypertrophy|Surgery Degradation][getSlave($AS).geneticQuirks.mGain = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", getSlave($AS)), surgeryDamage(getSlave($AS),40), getSlave($AS).chem += 100,$surgeryType = "gene treatment"]]