diff --git a/pom.xml b/pom.xml
index 1db82ea..a394acb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,6 +171,10 @@
             <artifactId>minio</artifactId>
             <version>8.4.3</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index a0b82d5..84df03b 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -7,11 +7,7 @@ spring.datasource.driver-class-name=org.postgresql.Driver
 
 # Hibernate properties
 #spring.jpa.hibernate.ddl-auto=update
-<<<<<<< Updated upstream
-#spring.jpa.show-sql=true
-=======
 spring.jpa.show-sql=true
->>>>>>> Stashed changes
 #spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 
 security.jwt.secret=ballistic-test-secret-key-1234567890-ABCDEFGHIJKLNMOPQRST
@@ -19,7 +15,6 @@ security.jwt.access-token-minutes=2880
 
 # Logging
 
-spring.jpa.show-sql=true
 logging.level.org.hibernate.SQL=INFO
 logging.level.org.hibernate.type.descriptor.sql.BasicBinder=warn