diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-commande.php
old mode 100644
new mode 100755
diff --git a/dev/initdata/generate-facture.php b/dev/initdata/generate-facture.php
old mode 100644
new mode 100755
diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-produit.php
old mode 100644
new mode 100755
diff --git a/dev/initdata/generate-propale.php b/dev/initdata/generate-propale.php
old mode 100644
new mode 100755
diff --git a/dev/initdata/generate-societe.php b/dev/initdata/generate-societe.php
old mode 100644
new mode 100755
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
old mode 100755
new mode 100644
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
old mode 100755
new mode 100644
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
old mode 100755
new mode 100644
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index c5bb7993c18..4f24998227a 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -433,18 +433,6 @@ if ($resql)
 }
 
 // Browser
-<<<<<<< HEAD
-print '<br>';
-print '<strong>'.$langs->trans("Browser").'</strong>: ';
-var_dump($conf->browser);
-print '<br>';
-
-// Database statistics update
-print '<br>';
-print '<strong>'.$langs->trans("DatabaseStatistics").'</strong>: ';
-print '<br>';
-
-=======
 print '<br>';
 print '<strong>'.$langs->trans("Browser").'</strong>:<br>';
 if (! in_array($conf->browser->name, array('chrome','opera','safari','firefox')))
@@ -463,7 +451,6 @@ print '<br>';
 print '<strong>'.$langs->trans("DatabaseStatistics").'</strong>: ';
 print '<br>';
 */
->>>>>>> 7485192cfbca23027d10cfdc41a33a14f332d23c
 
 
 llxFooter();
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
old mode 100755
new mode 100644
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/genericobject.class.php b/htdocs/core/class/genericobject.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
old mode 100755
new mode 100644
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
old mode 100755
new mode 100644
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
old mode 100755
new mode 100644