diff --git a/sos/report/plugins/foreman_proxy.py b/sos/report/plugins/foreman_proxy.py
index 3c74418616..e958e25946 100644
--- a/sos/report/plugins/foreman_proxy.py
+++ b/sos/report/plugins/foreman_proxy.py
@@ -46,11 +46,7 @@ def setup(self):
             'HTTP_PROXY',
             'HTTPS_PROXY',
             'NO_PROXY',
-<<<<<<< HEAD
-            'ALL_PROXY'
-=======
             'ALL_PROXY',
->>>>>>> 41fa32b4 ([foreman] [foreman_proxy] Add ALL_PROXY and NO_PROXY to collected env_vars)
         ])
 
     def postproc(self):