diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..876ca3c3
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+deploy.yml merge=ours
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 7255fc40..5573639b 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -59,5 +59,5 @@ spring.mail.properties.mail.smtp.starttls.required=true
 message.max.amount.reports=2
 
 #Logging:
-logging.level.com.chat.yourway=${LOGGING_LEVEL:info}
+logging.level.com.chat.yourway=${LOGGING_LEVEL:trace}