diff --git a/app/Constants.php b/app/Constants.php
index 1cb42c7d1e0a..2568ea55f075 100644
--- a/app/Constants.php
+++ b/app/Constants.php
@@ -158,11 +158,7 @@ if (! defined('APP_NAME')) {
     define('MAX_DOCUMENT_SIZE', env('MAX_DOCUMENT_SIZE', 10000)); // KB
     define('MAX_EMAIL_DOCUMENTS_SIZE', env('MAX_EMAIL_DOCUMENTS_SIZE', 10000)); // Total KB
     define('MAX_ZIP_DOCUMENTS_SIZE', env('MAX_EMAIL_DOCUMENTS_SIZE', 30000)); // Total KB (uncompressed)
-<<<<<<< HEAD
-    define('MAX_EMAILS_SENT_PER_DAY', 500);
-=======
     define('MAX_EMAILS_SENT_PER_DAY', 300);
->>>>>>> release-4.4.0
     define('DOCUMENT_PREVIEW_SIZE', env('DOCUMENT_PREVIEW_SIZE', 300)); // pixels
     define('DEFAULT_FONT_SIZE', 9);
     define('DEFAULT_HEADER_FONT', 1); // Roboto