diff --git a/defaults/main.yml b/defaults/main.yml
index f4a96b062e9fe25d8b8794b2b32f76216d350b50..ea3bd8eb8915b98e1a66b806140642d935a2a560 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -28,9 +28,9 @@ gitlab:
     auto_link_ldap_user: 'true'
     providers: []
   upload_size_max: 128M
-  mail: {}
-    #from: 'git@domain'
-    #reply_to: 'git@domain'
+  mail:
+    from: ~
+    reply_to: ~
   smtp:
     enabled: false
     server: ~
@@ -44,4 +44,3 @@ gitlab:
     verify_ssl: 'peer' # Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert'
     ca_path: ~ # eg '/etc/ssl/certs'
     ca_file: ~ # eg '/etc/ssl/certs/ca-certificates.crt'
->>>>>>> 6437b6d42cd6f19b8ff220e02319088c9819bd70