diff --git a/libxcb-1.14.tar.gz b/libxcb-1.14.tar.gz
deleted file mode 100644
index 7befb90..0000000
Binary files a/libxcb-1.14.tar.gz and /dev/null differ
diff --git a/libxcb-1.14.tar.xz b/libxcb-1.14.tar.xz
new file mode 100644
index 0000000..496c192
Binary files /dev/null and b/libxcb-1.14.tar.xz differ
diff --git a/libxcb.spec b/libxcb.spec
index 7cad90b..38206b9 100644
--- a/libxcb.spec
+++ b/libxcb.spec
@@ -4,7 +4,11 @@ Release:        1
 Summary:        A C binding to the X11 protocol
 License:        MIT
 URL:            https://xcb.freedesktop.org/
+<<<<<<< HEAD
+Source0:        https://xcb.freedesktop.org/dist/%{name}-%{version}.tar.xz
+=======
 Source0:        https://xcb.freedesktop.org/dist/%{name}-%{version}.tar.gz
+>>>>>>> a3cba188aee1d61f8793ac24b32c15ad148e4659
 
 # This is stolen straight from the pthread-stubs source:
 # http://cgit.freedesktop.org/xcb/pthread-stubs/blob/?id=6900598192bacf5fd9a34619b11328f746a5956d
@@ -78,7 +82,11 @@ make check
 %exclude %{_docdir}/%{name}-%{version}/COPYING
 
 %changelog
+<<<<<<< HEAD
+* Mon Jul 31 2020 chxssg<chxssg@qq.com> - 1.14-1
+=======
 * Mon Jul 27 2020 chxssg<chxssg@qq.com> - 1.14-1
+>>>>>>> a3cba188aee1d61f8793ac24b32c15ad148e4659
 - update package to 1.14 
 
 * Tue Sep 03 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.13.1-2