diff --git a/.idea/misc.xml b/.idea/misc.xml
index 23f3b17..927f567 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,9 @@
   <component name="Black">
     <option name="sdkName" value="Python 3.13" />
   </component>
+<<<<<<< HEAD
   <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13 (python.fast-api-converter)" project-jdk-type="Python SDK" />
+=======
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (2)" project-jdk-type="Python SDK" />
+>>>>>>> 83d5327 (Sichere Änderungen)
 </project>
\ No newline at end of file
diff --git a/.idea/python.fast-api-converter.iml b/.idea/python.fast-api-converter.iml
index da4c172..9ae9a3d 100644
--- a/.idea/python.fast-api-converter.iml
+++ b/.idea/python.fast-api-converter.iml
@@ -5,7 +5,11 @@
       <excludeFolder url="file://$MODULE_DIR$/.venv" />
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
+<<<<<<< HEAD
     <orderEntry type="jdk" jdkName="Python 3.13 (python.fast-api-converter)" jdkType="Python SDK" />
+=======
+    <orderEntry type="jdk" jdkName="Python 3.12 (2)" jdkType="Python SDK" />
+>>>>>>> 83d5327 (Sichere Änderungen)
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">