diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py
index 4877bee73..e58b77ecb 100755
--- a/install/installCyberPanel.py
+++ b/install/installCyberPanel.py
@@ -243,11 +243,7 @@ class InstallCyberPanel:
         if self.distro == ubuntu:
             command = "apt-get -y install mariadb-server"
         elif self.distro == centos:
-<<<<<<< HEAD
-            command = 'yum --enablerepo=CyberPanel -y install mariadb-server'
-=======
             command = 'yum --enablerepo=mariadb -y install MariaDB-server MariaDB-client'
->>>>>>> 29c0a38e... do not depend on CyberPanel own repo fro cent7
         elif self.distro == cent8:
             command = 'dnf -y install mariadb-server'