diff --git a/python-urllib3.spec b/python-urllib3.spec
index 4759c9a..0075c27 100644
--- a/python-urllib3.spec
+++ b/python-urllib3.spec
@@ -4,13 +4,8 @@
 %bcond_without tests
 
 Name:           python-%{srcname}
-<<<<<<< HEAD
-Version:        1.25.3
-Release:        4%{?dist}
-=======
 Version:        1.25.6
 Release:        1%{?dist}
->>>>>>> 5787270... Update to v1.25.6
 Summary:        Python HTTP library with thread-safe connection pooling and file post
 
 License:        MIT