diff --git a/templates/bateau.html b/templates/bateau.html
index a079c34..3913bc5 100644
--- a/templates/bateau.html
+++ b/templates/bateau.html
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-<<<<<<< HEAD
 <!--- Variables
 nom
 constructeur
@@ -9,23 +8,16 @@ condamnation
 origine
 histoire
 !-->
-=======
->>>>>>> 61d0bb5f79632cfca295415fba8312c0abc41cf5
-<!-- saved from url=(0055)file:///C:/Users/rugja/Marin/templates/bateau_temp.html -->
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     
     <title>{{nom}}</title>
-<<<<<<< HEAD
     <link href="../static/style.css" rel="stylesheet" type="text/css">
-=======
     <link href="file:///C:/Users/rugja/Marin/templates/style.css" rel="stylesheet" type="text/css">
->>>>>>> 61d0bb5f79632cfca295415fba8312c0abc41cf5
 </head> 
 <body>
 	<h1>{{nom}}}</h1>
 	<table>
 		<tbody><tr>
-<<<<<<< HEAD
 			<td>Nom</td>
 			<td>{{NomBateau}}</td>
 		</tr>
@@ -48,7 +40,6 @@ histoire
 		<tr>
 			<td>Origine</td>
 			<td>{{ville}}</td>
-=======
 			<th>Nom</th>
 			<th>{{NomBateau}}</th>
 		</tr>
@@ -71,7 +62,6 @@ histoire
 		<tr>
 			<th>Origine</th>
 			<th>{{ville}}</th>
->>>>>>> 61d0bb5f79632cfca295415fba8312c0abc41cf5
 		</tr>
 	</tbody></table>
 	<p>
@@ -79,4 +69,4 @@ histoire
 	</p>
 
 
-</body></html>
\ No newline at end of file
+</body></html>
