diff --git a/About/Manifest.xml b/About/Manifest.xml
index 75aba12..64c082a 100644
--- a/About/Manifest.xml
+++ b/About/Manifest.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
+<<<<<<< HEAD
 	<version>2.2.15.9</version>
+=======
+	<version>2.2.15.8</version>
+>>>>>>> 1ae8bcc9e692d3668eef68ba43f04a1cca54de9a
 	<manifestUri>https://gitgud.io/Tory/rimnude-unofficial/-/raw/master/About/Manifest.xml</manifestUri>
     <downloadUri>https://gitgud.io/Tory/rimnude-unofficial/</downloadUri>
 </Manifest>
diff --git a/Common/Patches/NudePatch-Snake.xml b/Common/Patches/NudePatch-Snake.xml
index 7bf5365..f750518 100644
--- a/Common/Patches/NudePatch-Snake.xml
+++ b/Common/Patches/NudePatch-Snake.xml
@@ -96,7 +96,11 @@
 							<MissingBodyPart>Injuries/breasts_missing_left</MissingBodyPart>
 						<!-- race support -->	
 							<!-- ghoul -->
+<<<<<<< HEAD
 							<GhoulBreasts MayRequireAnyOf="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+=======
+							<GhoulBreasts MayRequire="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+>>>>>>> 1ae8bcc9e692d3668eef68ba43f04a1cca54de9a
 								<path>Breasts/breasts_micro_left</path>
 								<severity>
 									<a1.01>Breasts/breasts_huge_left</a1.01>
@@ -108,7 +112,11 @@
 								</severity>
 							</GhoulBreasts>
 							<!-- orc -->
+<<<<<<< HEAD
 							<OrcBreasts MayRequireAnyOf="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+=======
+							<OrcBreasts MayRequire="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+>>>>>>> 1ae8bcc9e692d3668eef68ba43f04a1cca54de9a
 								<path>Breasts/breasts_micro_left</path>
 								<severity>
 									<a1.01>Breasts/breasts_huge_left</a1.01>
@@ -120,7 +128,11 @@
 								</severity>
 							</OrcBreasts>
 							<!-- scale -->
+<<<<<<< HEAD
 							<ScaleBreasts MayRequireAnyOf="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+=======
+							<ScaleBreasts MayRequire="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+>>>>>>> 1ae8bcc9e692d3668eef68ba43f04a1cca54de9a
 								<path>Breasts/breasts_scalie_micro_left</path>
 								<severity>
 									<a1.01>Breasts/breasts_scalie_huge_left</a1.01>
@@ -132,7 +144,11 @@
 								</severity>
 							</ScaleBreasts>
 							<!-- tree -->
+<<<<<<< HEAD
 							<TreeBreasts MayRequireAnyOf="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+=======
+							<TreeBreasts MayRequire="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+>>>>>>> 1ae8bcc9e692d3668eef68ba43f04a1cca54de9a
 								<path>Breasts/breasts_micro_left</path>
 								<severity>
 									<a1.01>Breasts/breasts_huge_left</a1.01>
@@ -144,7 +160,11 @@
 								</severity>
 							</TreeBreasts>
 							<!-- ghost -->
+<<<<<<< HEAD
 							<GhostBreasts MayRequireAnyOf="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+=======
+							<GhostBreasts MayRequire="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+>>>>>>> 1ae8bcc9e692d3668eef68ba43f04a1cca54de9a
 								<path>Breasts/Ghost/breasts_micro_left</path>
 								<severity>
 									<a1.01>Breasts/Ghost/breasts_huge_left</a1.01>
@@ -156,7 +176,11 @@
 								</severity>
 							</GhostBreasts>
 							<!-- dead -->
+<<<<<<< HEAD
 							<NecroBreasts MayRequireAnyOf="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+=======
+							<NecroBreasts MayRequire="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+>>>>>>> 1ae8bcc9e692d3668eef68ba43f04a1cca54de9a
 								<path>Breasts/breasts_micro_left</path>
 								<severity>
 									<a1.01>Breasts/breasts_huge_left</a1.01>
@@ -263,7 +287,11 @@
 							<MissingBodyPart>Injuries/breasts_missing_right</MissingBodyPart>
 						<!-- race support -->	
 							<!-- ghoul -->
+<<<<<<< HEAD
 							<GhoulBreasts MayRequireAnyOf="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+=======
+							<GhoulBreasts MayRequire="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+>>>>>>> 1ae8bcc9e692d3668eef68ba43f04a1cca54de9a
 								<path>Breasts/breasts_micro_right</path>
 								<severity>
 									<a1.01>Breasts/breasts_huge_right</a1.01>
@@ -275,7 +303,11 @@
 								</severity>
 							</GhoulBreasts>
 							<!-- orc -->
+<<<<<<< HEAD
 							<OrcBreasts MayRequireAnyOf="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+=======
+							<OrcBreasts MayRequire="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+>>>>>>> 1ae8bcc9e692d3668eef68ba43f04a1cca54de9a
 								<path>Breasts/breasts_micro_right</path>
 								<severity>
 									<a1.01>Breasts/breasts_huge_right</a1.01>
@@ -287,7 +319,11 @@
 								</severity>
 							</OrcBreasts>
 							<!-- scale -->
+<<<<<<< HEAD
 							<ScaleBreasts MayRequireAnyOf="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+=======
+							<ScaleBreasts MayRequire="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+>>>>>>> 1ae8bcc9e692d3668eef68ba43f04a1cca54de9a
 								<path>Breasts/breasts_scalie_micro_right</path>
 								<severity>
 									<a1.01>Breasts/breasts_scalie_huge_right</a1.01>
@@ -299,7 +335,11 @@
 								</severity>
 							</ScaleBreasts>
 							<!-- tree -->
+<<<<<<< HEAD
 							<TreeBreasts MayRequireAnyOf="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+=======
+							<TreeBreasts MayRequire="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+>>>>>>> 1ae8bcc9e692d3668eef68ba43f04a1cca54de9a
 								<path>Breasts/breasts_micro_right</path>
 								<severity>
 									<a1.01>Breasts/breasts_huge_right</a1.01>
@@ -311,7 +351,11 @@
 								</severity>
 							</TreeBreasts>
 							<!-- ghost -->
+<<<<<<< HEAD
 							<GhostBreasts MayRequireAnyOf="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+=======
+							<GhostBreasts MayRequire="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+>>>>>>> 1ae8bcc9e692d3668eef68ba43f04a1cca54de9a
 								<path>Breasts/Ghost/breasts_micro_right</path>
 								<severity>
 									<a1.01>Breasts/Ghost/breasts_huge_right</a1.01>
@@ -323,7 +367,11 @@
 								</severity>
 							</GhostBreasts>
 							<!-- dead -->
+<<<<<<< HEAD
 							<NecroBreasts MayRequireAnyOf="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+=======
+							<NecroBreasts MayRequire="Abraxas.RJW.RaceSupport,asmr.rjw.racesupport">
+>>>>>>> 1ae8bcc9e692d3668eef68ba43f04a1cca54de9a
 								<path>Breasts/breasts_micro_right</path>
 								<severity>
 									<a1.01>Breasts/breasts_huge_right</a1.01>
diff --git a/changelog.txt b/changelog.txt
index 4edaec1..619cbe1 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,8 +1,11 @@
+<<<<<<< HEAD
 ver 2.2.15.9 Unofficial
 - Updated Patches
   - BB offset support might be working again.
   - Racesupport parts should work now if they weren't before
 
+=======
+>>>>>>> 1ae8bcc9e692d3668eef68ba43f04a1cca54de9a
 ver 2.2.15.8 Unofficial
 - Updated Revealing Apparel code (sjkincade)