diff --git a/htdocs/opensurvey/public/create_survey.php b/htdocs/opensurvey/public/create_survey.php
index 58684f30c32c1391508b4f0c56a95bd16474c647..729255a6ca19bd44c592f0f0450bd352d6a01453 100755
--- a/htdocs/opensurvey/public/create_survey.php
+++ b/htdocs/opensurvey/public/create_survey.php
@@ -162,11 +162,7 @@ print '</script>'."\n";
 
 print '<br>'."\n";
 
-<<<<<<< HEAD
-//affichage du cochage par défaut
-=======
 // Check or not
->>>>>>> branch 'develop' of https://github.com/Dolibarr/dolibarr.git
 $cocheplus='';
 if ($_SESSION["canedit"]) $cocheplus="checked";
 
diff --git a/htdocs/opensurvey/public/exportcsv.php b/htdocs/opensurvey/public/exportcsv.php
index 3b1f22d22437b753ffc0959bcf75c2aa1395b017..f933b37a3170c00d1f680aa559000ceeb7d57db7 100755
--- a/htdocs/opensurvey/public/exportcsv.php
+++ b/htdocs/opensurvey/public/exportcsv.php
@@ -64,10 +64,6 @@ $now=dol_now();
 
 $nbcolonnes=substr_count($object->sujet,',')+1;
 $toutsujet=explode(",",$object->sujet);
-<<<<<<< HEAD
-//$toutsujet=str_replace("°","'",$toutsujet);
-=======
->>>>>>> branch 'develop' of https://github.com/Dolibarr/dolibarr.git
 
 // affichage des sujets du sondage
 $input.=$langs->trans("Name").";";
@@ -154,4 +150,4 @@ header('Cache-Control: max-age=10');
 echo $input;
 
 exit;
-?>
+?>
\ No newline at end of file