diff --git a/htslib-1.11.tar.gz b/htslib-1.11.tar.gz
deleted file mode 100644
index b3de40954167969a733ea97424b977bcc1a2507a..0000000000000000000000000000000000000000
Binary files a/htslib-1.11.tar.gz and /dev/null differ
diff --git a/htslib-1.18.tar.bz2 b/htslib-1.18.tar.bz2
new file mode 100644
index 0000000000000000000000000000000000000000..990098d1fbec2002b8e69fea1a49188c803f64cb
Binary files /dev/null and b/htslib-1.18.tar.bz2 differ
diff --git a/htslib.spec b/htslib.spec
index 57643aee4362c7f4c30bbe01bfd7e7fdca16b6ae..8633a5b8fabea4b062ec4d34f676d09e328b5741 100644
--- a/htslib.spec
+++ b/htslib.spec
@@ -1,12 +1,16 @@
 Name:    htslib
-Version: 1.11
+<<<<<<< HEAD
+Version: 1.18
+=======
+Version: 1.17
+>>>>>>> refs/remotes/origin/master
 Release: 1
 Summary: C library for high-throughput sequencing data formats
 License: MIT and BSD
 URL:	 http://www.htslib.org
-Source0: https://github.com/samtools/htslib/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0: https://github.com/samtools/htslib/releases/download/%{version}/htslib-%{version}.tar.bz2
 
-BuildRequires: 	gcc autoconf automake make curl-devel zlib-devel bzip2-devel xz-devel libxcrypt-devel openssl-devel
+BuildRequires: 	gcc make curl-devel zlib zlib-devel bzip2-devel xz-devel libxcrypt-devel openssl-devel
 
 %description
 HTSlib is an implementation of a unified C library for accessing common file 
@@ -36,17 +40,12 @@ the htsfile identifier tool, and the bgzip compression utility.
 
 %prep
 %setup -q -n %{name}-%{version}
-touch config.guess config.sub
 
 %build
-autoheader
-autoconf
 %configure --prefix=%{_prefix} \
     --libdir=%{_libdir} \
     --enable-plugins \
-    --enable-gcs \
-    --enable-libcurl \
-    --enable-s3
+    --enable-libcurl 
 %make_build
 # As we don't install libhts.a, the .private keywords are irrelevant.
 sed -i -E '/^(Libs|Requires)\.private:/d' htslib.pc.tmp
@@ -86,6 +85,15 @@ rm -rf %{buildroot}/%{_libdir}/libhts.a
 %{_mandir}/man1/tabix.1*
 
 %changelog
+<<<<<<< HEAD
+* Mon Oct 16 2021 guoyizhang <kuoi@bioarchlinux.org> - 1.18-1
+- Update to 1.18
+
+=======
+>>>>>>> refs/remotes/origin/master
+* Wed May 24 2023 guoyizhang <kuoi@bioarchlinux.org> - 1.17-1
+- Update to 1.17
+
 * Wed Feb 09 2022 herengui <herengui@uniontech.com> - 1.11-1
 - update to 1.11, new version fixed CVE-2020-36403