diff --git a/templates/expedition.html b/templates/expedition.html
index fd4372e..3272eb7 100644
--- a/templates/expedition.html
+++ b/templates/expedition.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<<<<<<< HEAD
+
 <!--- Variables
 nom
 prenom
@@ -8,14 +8,14 @@ place
 histoire
 !-->
 <!-- saved from url=(0055)file:///C:/Users/rugja/Marin/templates/bateau_temp.html -->
-=======
->>>>>>> f53b67000eac017030794619a1ccd0eaa7ad151e
+
+
 <html><head>
     <title>{{nom}}- Sauveteurs du dunkerquois</title>
     {% include 'head.html' %}
 </head> 
 <body>
-<<<<<<< HEAD
+
 	{% include "smallheader.html" %}
 	<h1>{{nom}}</h1>
 	<div class="flexbox">
@@ -32,9 +32,7 @@ histoire
 		</tr>
 
 	</tbody></table>
-=======
-    {% include "smallheader.html" %}
-    <h1>{{siecle}}</h1>
+
 </body>
 </html>
->>>>>>> f53b67000eac017030794619a1ccd0eaa7ad151e
+
