diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 57db7dd..a0b82d5 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -7,7 +7,11 @@ 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