diff --git a/RJWSexperience/IdeologyAddon/Ideology/Rituals/RitualOutcomeComps.cs b/RJWSexperience/IdeologyAddon/Ideology/Rituals/RitualOutcomeComps.cs
index e86060c..15650f8 100644
--- a/RJWSexperience/IdeologyAddon/Ideology/Rituals/RitualOutcomeComps.cs
+++ b/RJWSexperience/IdeologyAddon/Ideology/Rituals/RitualOutcomeComps.cs
@@ -40,12 +40,8 @@ namespace RJWSexperience.Ideology
 		}
 		
 
-<<<<<<< HEAD
 
 		public override ExpectedOutcomeDesc GetExpectedOutcomeDesc(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments, RitualOutcomeComp_Data data)
-=======
-        public override ExpectedOutcomeDesc GetExpectedOutcomeDesc(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments, RitualOutcomeComp_Data data)
->>>>>>> 2c61e8b5425da0190af8f9c6a499a3da7cd49dcf
 		{
 			return new ExpectedOutcomeDesc
 			{
diff --git a/RJWSexperience/RJWSexperience/RJW_Patch.cs b/RJWSexperience/RJWSexperience/RJW_Patch.cs
index 730d821..998837f 100644
--- a/RJWSexperience/RJWSexperience/RJW_Patch.cs
+++ b/RJWSexperience/RJWSexperience/RJW_Patch.cs
@@ -220,20 +220,13 @@ namespace RJWSexperience
 
         public static void Prefix(SexProps props, ref float satisfaction)
         {
-<<<<<<< HEAD
-=======
             Pawn pawn = props.pawn;
->>>>>>> 2c61e8b5425da0190af8f9c6a499a3da7cd49dcf
             Pawn partner = props.partner;
             satisfaction = Mathf.Max(base_sat_per_fuck, satisfaction * partner.GetSexStat());
         }
 
         public static void Postfix(SexProps props, float satisfaction)
         {
-<<<<<<< HEAD
-=======
-
->>>>>>> 2c61e8b5425da0190af8f9c6a499a3da7cd49dcf
             Pawn pawn = props.pawn;
             Pawn partner = props.partner;
             float? lust = pawn.records?.GetValue(VariousDefOf.Lust);