diff --git a/pom.xml b/pom.xml
index 1873d07..b0f6764 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,16 +32,12 @@
             <artifactId>javafx-controls</artifactId>
             <version>${javafx.version}</version>
         </dependency>
-<<<<<<< HEAD
-
         <!-- https://mvnrepository.com/artifact/org.springframework.security/spring-security-crypto -->
         <dependency>
           <groupId>org.springframework.security</groupId>
           <artifactId>spring-security-crypto</artifactId>
           <version>7.0.2</version>
         </dependency>
-=======
->>>>>>> main
     </dependencies>
 
     <build>