diff --git a/.gitignore b/.gitignore
index 23d6846..c453563 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,12 +4,8 @@ out/
 !**/src/test/**/out/
 .kotlin
 XACrypto.jar
-<<<<<<< HEAD
 tests
-.idea/
-=======
 .idea
->>>>>>> main
 
 ### Eclipse ###
 .apt_generated
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2e3c40a..7b13def 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-<<<<<<< HEAD
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_26_PREVIEW" project-jdk-name="openjdk-26" project-jdk-type="JavaSDK">
-=======
+
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
@@ -11,8 +9,12 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" default="true" project-jdk-name="openjdk-26" project-jdk-type="JavaSDK">
->>>>>>> main
+
+  <component name="ProjectRootManager"
+             version="2"
+             languageLevel="JDK_26_PREVIEW"
+             project-jdk-name="openjdk-26"
+             project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file