diff --git a/1.6/Defs/PawnKindDefs/PawnKinds.xml b/1.6/Defs/PawnKindDefs/PawnKinds.xml
index 9fc5808..e0dd962 100644
--- a/1.6/Defs/PawnKindDefs/PawnKinds.xml
+++ b/1.6/Defs/PawnKindDefs/PawnKinds.xml
@@ -53,6 +53,7 @@
 		</weaponTags>
 		<initialWillRange>3~5</initialWillRange>
 		<initialResistanceRange>19~30</initialResistanceRange>
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
         	<backstoryFiltersOverride>
             	    <li>
@@ -65,6 +66,8 @@
             	    </li>
        		</backstoryFiltersOverride>
 =======
+=======
+>>>>>>> Stashed changes
 		<backstoryFiltersOverride>
 			<li>
 				<categoriesAdulthood>
@@ -77,6 +80,9 @@
 				</categoriesChildhood>
 			</li>
 		</backstoryFiltersOverride>
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 	</PawnKindDef>