diff --git a/install/rhel/7/pma/config.inc.conf b/install/rhel/7/pma/config.inc.conf
index d2ab6946e..1a65fd6cf 100644
--- a/install/rhel/7/pma/config.inc.conf
+++ b/install/rhel/7/pma/config.inc.conf
@@ -16,7 +16,6 @@
  */
 $cfg['blowfish_secret'] = '%blowfish_secret%'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
 
-<<<<<<< HEAD
 /**
 =======
 /*
@@ -26,7 +25,6 @@ $cfg['blowfish_secret'] = '%blowfish_secret%'; /* YOU MUST FILL IN THIS FOR COOK
 $cfg['TempDir']  = '/tmp';
 
 /*
->>>>>>> Update config.inc.conf
  * Servers configuration
  */
 $i = 0;