diff --git a/.gitignore b/.gitignore
index 9cb8cb9..aa7577e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,4 @@
 app*
 content/robots.txt
-<<<<<<< HEAD
 custom/smtp-config.php*
-.htaccess*
-=======
-custom/smtp-config.php
 content/.htaccess
->>>>>>> 6034ab6b59a6fed575a2b98cfb044b75a481ba0d
diff --git a/content/.htaccess b/content/.htaccess
index 5bbdf2e..5a80ff1 100644
--- a/content/.htaccess
+++ b/content/.htaccess
@@ -12,3 +12,10 @@ DirectorySlash Off
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteRule ^(.*)$ /index.php [L,QSA]
 </IfModule>
+
+# php -- BEGIN cPanel-generated handler, do not edit
+# Set the “alt-php84” package as the default “PHP” programming language.
+<IfModule mime_module>
+  AddHandler application/x-httpd-alt-php84 .php .php8 .phtml
+</IfModule>
+# php -- END cPanel-generated handler, do not edit