diff --git a/cyberpanel.sh b/cyberpanel.sh
index a3045e7c1..49b3c20af 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -987,12 +987,9 @@ if [[ "$Server_OS" = "CentOS" ]] ; then
 else
   apt update -y
   DEBIAN_FRONTEND=noninteractive apt upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"
-<<<<<<< HEAD
-	if [[ "$Server_Provider" = "Alibaba Cloud" ]] ; then 
+	if [[ "$Server_Provider" = "Alibaba Cloud" ]] ; then
     apt install -y --allow-downgrades libgnutls30=3.6.13-2ubuntu1.3
-  fi 
-=======
->>>>>>> v2.1.1
+  fi
   DEBIAN_FRONTEND=noninteracitve apt install -y dnsutils net-tools htop telnet libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev virtualenv git socat vim unzip zip
     Check_Return
 
@@ -1086,12 +1083,12 @@ if [[ "$Server_OS" = "CentOS" ]] ; then
     fi
     #CentOS 7 specific change
     if [[ "$Server_OS_Version" = "8" ]] ; then
-	      if grep -q -E "Rocky Linux" /etc/os-release ; then 
-        if [[ "$Server_Country" = "CN" ]] ; then 
+	      if grep -q -E "Rocky Linux" /etc/os-release ; then
+        if [[ "$Server_Country" = "CN" ]] ; then
           sed -i 's|rpm -Uvh http://rpms.litespeedtech.com/centos/litespeed-repo-1.1-1.el8.noarch.rpm|curl -o /etc/yum.repos.d/litespeed.repo https://cyberpanel.sh/litespeed/litespeed_cn.repo|g' install.py
         else
           sed -i 's|rpm -Uvh http://rpms.litespeedtech.com/centos/litespeed-repo-1.1-1.el8.noarch.rpm|curl -o /etc/yum.repos.d/litespeed.repo https://cyberpanel.sh/litespeed/litespeed.repo|g' install.py
-        fi 
+        fi
       fi
     fi
     #CentOS 8 specific change
@@ -1930,4 +1927,4 @@ Post_Install_Setup_Utility
 
 Post_Install_Tweak
 
-Post_Install_Display_Final_Info
+Post_Install_Display_Final_Info
\ No newline at end of file