diff --git a/RJWSexperience/IdeologyAddon/Ideology/ThoughtWorker_Precept_GenitalSize_Approved.cs b/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_GenitalSize_Approved.cs
similarity index 100%
rename from RJWSexperience/IdeologyAddon/Ideology/ThoughtWorker_Precept_GenitalSize_Approved.cs
rename to RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_GenitalSize_Approved.cs
diff --git a/RJWSexperience/IdeologyAddon/Ideology/ThoughtWorker_Precept_GenitalSize_Approved_Social.cs b/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_GenitalSize_Approved_Social.cs
similarity index 100%
rename from RJWSexperience/IdeologyAddon/Ideology/ThoughtWorker_Precept_GenitalSize_Approved_Social.cs
rename to RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_GenitalSize_Approved_Social.cs
diff --git a/RJWSexperience/IdeologyAddon/Ideology/ThoughtWorker_Precept_GenitalSize_Disapproved.cs b/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_GenitalSize_Disapproved.cs
similarity index 100%
rename from RJWSexperience/IdeologyAddon/Ideology/ThoughtWorker_Precept_GenitalSize_Disapproved.cs
rename to RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_GenitalSize_Disapproved.cs
diff --git a/RJWSexperience/IdeologyAddon/Ideology/ThoughtWorker_Precept_GenitalSize_Disapproved_Social.cs b/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_GenitalSize_Disapproved_Social.cs
similarity index 100%
rename from RJWSexperience/IdeologyAddon/Ideology/ThoughtWorker_Precept_GenitalSize_Disapproved_Social.cs
rename to RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_GenitalSize_Disapproved_Social.cs
diff --git a/RJWSexperience/IdeologyAddon/Ideology/RJW_Patch_Ideo.cs b/RJWSexperience/IdeologyAddon/Ideology/RJW_Patch_Ideo.cs
index 1df88b1..91e07c4 100644
--- a/RJWSexperience/IdeologyAddon/Ideology/RJW_Patch_Ideo.cs
+++ b/RJWSexperience/IdeologyAddon/Ideology/RJW_Patch_Ideo.cs
@@ -381,7 +381,6 @@ namespace RJWSexperience.Ideology
 		}
 	}
 
-<<<<<<< HEAD
 	[HarmonyPatch(typeof(Hediff_BasePregnancy), "PostBirth")]
 	public static class RJW_Patch_PostBirth
 	{
diff --git a/RJWSexperience/IdeologyAddon/Ideology/Utility.cs b/RJWSexperience/IdeologyAddon/Ideology/Utility.cs
index 7691c87..4aa4231 100644
--- a/RJWSexperience/IdeologyAddon/Ideology/Utility.cs
+++ b/RJWSexperience/IdeologyAddon/Ideology/Utility.cs
@@ -1,9 +1,5 @@
 using RimWorld;
-<<<<<<< HEAD
-using System;
-=======
 using rjw;
->>>>>>> SizeMattersPrecept
 using System.Collections.Generic;
 using System.Linq;
 using Verse;
@@ -71,7 +67,7 @@ namespace RJWSexperience.Ideology
 				pawn.ideo.IdeoConversionAttempt(severity, partner.Ideo);
 			}
 		}
-    }
+
 		public static float getGenitalSize(Pawn p)
 		{
 			if (p == null)