diff --git a/install/rhel/7/pma/config.inc.conf b/install/rhel/7/pma/config.inc.conf
index 8f3e0a7b..d2ab6946 100644
--- a/install/rhel/7/pma/config.inc.conf
+++ b/install/rhel/7/pma/config.inc.conf
@@ -16,7 +16,17 @@
  */
 $cfg['blowfish_secret'] = '%blowfish_secret%'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
 
+<<<<<<< HEAD
 /**
+=======
+/*
+ * Temp dir for faster beahivour
+ *
+ */
+$cfg['TempDir']  = '/tmp';
+
+/*
+>>>>>>> Update config.inc.conf
  * Servers configuration
  */
 $i = 0;