diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index 496a8324..4350b4bb 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -62,11 +62,16 @@ API={{ api_enabled or 'false' }}
 # Dav server implementation (value: radicale, none). To enable this feature, recreate the docker-compose.yml file via setup.
 WEBDAV={{ webdav_enabled or 'none' }}
 
+<<<<<<< HEAD
 # Antivirus solution (value: clamav, none). To enable this feature, recreate the docker-compose.yml file via setup.
 ANTIVIRUS={{ antivirus_enabled or 'none' }}
 
 # Scan Macros solution (value: true, false). To enable this feature, recreate the docker-compose.yml file via setup.
 SCAN_MACROS={{ oletools_enabled or 'false' }}
+=======
+# Antivirus solution (value: clamav, none)
+ANTIVIRUS={{ antivirus_enabled or 'none' }}
+>>>>>>> e5f355c9 (Fix ANTIVIRUS line in mailu.env file)
 
 ###################################
 # Mail settings