diff --git a/source/clear-linux/guides/clearlinux/autoproxy_guide.rst.txt b/source/clear-linux/guides/clearlinux/autoproxy_guide.rst.txt
index b02e3fb5..ca4f64b8 100644
--- a/source/clear-linux/guides/clearlinux/autoproxy_guide.rst.txt
+++ b/source/clear-linux/guides/clearlinux/autoproxy_guide.rst.txt
@@ -1,11 +1,6 @@
 Autoproxy allows |CL| to operate seamlessly behind a proxy
-<<<<<<< a5c93dbc693eb8183bba173f39ac3956c37d9525:source/clear-linux/guides/clearlinux/autoproxy_guide.rst.txt
 because :ref:`software update <swupd-guide>` and other |CL| tools are
 implemented on top of libcurl. Tools that do not use libcurl, like git, must
-=======
-because :ref:`swupd-guide` and other |CL| tools are implemented on
-top of libcurl. Tools that do not use libcurl, like git, must
->>>>>>> changes based on reviewer comments:source/clear-linux/guides/clearlinux/autoproxy_guide.txt
 be configured independently. 
 
 If you encounter problems with autoproxy functioning, use