diff --git a/packages/cmake/build.sh b/packages/cmake/build.sh
index 3752bbc8ac..1cba9218a0 100644
--- a/packages/cmake/build.sh
+++ b/packages/cmake/build.sh
@@ -3,12 +3,7 @@ TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package soft
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 # When updating version here, please update termux_setup_cmake.sh as well.
-<<<<<<< HEAD
-TERMUX_PKG_VERSION=3.21.3
-TERMUX_PKG_REVISION=2
-=======
 TERMUX_PKG_VERSION=3.22.0
->>>>>>> d46ce3b6feabd30d4364b294194c86473590c06c
 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=998c7ba34778d2dfdb3df8a695469e24b11e2bfa21fbe41b361a3f45e1c9345e
 TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang, zlib"