diff --git a/source/conf.py b/source/conf.py
index db3ca6d8..54335c43 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -139,18 +139,10 @@ rst_prolog = """
 .. |podman| replace:: `Podman <https://podman.io/>`__
 .. |kes-stable| replace:: 0.16.1
 
-<<<<<<< HEAD
 .. |minio-tag| replace:: `RELEASE.2022-05-04T07-45-27Z <https://github.com/minio/minio/releases/tag/RELEASE.2022-05-04T07-45-27Z>`__
 .. |minio-latest| replace:: RELEASE.2022-05-04T07-45-27Z
 .. |minio-rpm| replace:: https://dl.min.io/server/minio/release/linux-amd64/minio-20220504074527.0.0.x86_64.rpm
 .. |minio-deb| replace:: https://dl.min.io/server/minio/release/linux-amd64/minio_20220504074527.0.0_amd64.deb
 .. |subnet| replace:: `MinIO SUBNET <https://min.io/pricing?jmp=docs>`
-=======
-.. |minio-tag| replace:: `RELEASE.2022-04-16T04-26-02Z <https://github.com/minio/minio/releases/tag/RELEASE.2022-04-16T04-26-02Z>`__
-.. |minio-latest| replace:: RELEASE.2022-04-16T04-26-02Z
-.. |minio-rpm| replace:: https://dl.min.io/server/minio/release/linux-amd64/minio-20220416042602.0.0.x86_64.rpm
-.. |minio-deb| replace:: https://dl.min.io/server/minio/release/linux-amd64/minio_20220416042602.0.0_amd64.deb
-.. |subnet| replace:: `MinIO SUBNET <https://min.io/pricing?jmp=docs>`__
->>>>>>> d15270a (DOCS-439: MinIO Console refresh)
 
 """
\ No newline at end of file