diff --git a/php/config.php b/php/config.php
index 1f977f7..103904d 100644
--- a/php/config.php
+++ b/php/config.php
@@ -47,15 +47,10 @@ define('DDSERVICE_PRIVATEKEY', '!%p856Dc');
 define('EPNTAP_APIS', 'http://voparis-tap.obspm.fr/__system__/tap/run/tap/sync');
 define('EPNTAP_AMDA', 'http://cdpp-epntap.irap.omp.eu/__system__/tap/run/tap/sync');
 
-<<<<<<< HEAD
-/*----------------------- PHP run-time settings --------*/
-ini_set('memory_limit', 128000000);
-ini_set('max_execution_time', 600); // max PHP execution
-=======
 // PHP run-time settings 
 ini_set('memory_limit',128000000);
 ini_set('max_execution_time',600); // max PHP execution
->>>>>>> master
+
 ini_set('default_socket_timeout', 600); //TODO if this is needed ? IMPEX LONG DURATION WEBSERVICES
 // to avoid 403 error while copying from URL
 ini_set('user_agent', 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:7.0) Gecko/201001012 Firefox/7.0');
--
libgit2 0.21.2