diff --git a/1.2/Assemblies/AutomataRace.dll b/1.2/Assemblies/AutomataRace.dll
index c247e18..3def783 100644
Binary files a/1.2/Assemblies/AutomataRace.dll and b/1.2/Assemblies/AutomataRace.dll differ
diff --git a/1.2/Defs/AutomataRaceSettings/AutomataRaceSettings.xml b/1.2/Defs/AutomataRaceSettings/AutomataRaceSettings.xml
index 764543d..9c52bc1 100644
--- a/1.2/Defs/AutomataRaceSettings/AutomataRaceSettings.xml
+++ b/1.2/Defs/AutomataRaceSettings/AutomataRaceSettings.xml
@@ -55,5 +55,19 @@
         <source>PrisonerBanishedToDie</source>
       </li>
     </deadThoughtOverrides>
+    <conflictingPassions>
+      <li>Shooting</li>
+      <li>Melee</li>
+      <li>Construction</li>
+      <li>Mining</li>
+      <li>Cooking</li>
+      <li>Plants</li>
+      <li>Animals</li>
+      <li>Crafting</li>
+      <li>Artistic</li>
+      <li>Medicine</li>
+      <li>Social</li>
+      <li>Intellectual</li>
+    </conflictingPassions>
   </AutomataRace.AutomataRaceSettings>
 </Defs>
\ No newline at end of file