diff --git a/templates/bateau.html b/templates/bateau.html
index 78e119c..a079c34 100644
--- a/templates/bateau.html
+++ b/templates/bateau.html
@@ -1,14 +1,54 @@
 <!DOCTYPE html>
+<<<<<<< HEAD
+<!--- Variables
+nom
+constructeur
+dimensions
+installation
+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>
+		<tr>
+			<td>Constructeur</td>
+			<td>{{nom}}</td>
+		</tr>
+		<tr>
+			<td>Dimensions</td>
+			<td>{{Dimensions}}</td>
+		</tr>
+		<tr>
+			<td>Installation</td>
+			<td>{{Date}}</td>
+		</tr>
+		<tr>
+			<td>Condamnation</td>
+			<td>{{Date}}</td>
+		</tr>
+		<tr>
+			<td>Origine</td>
+			<td>{{ville}}</td>
+=======
 			<th>Nom</th>
 			<th>{{NomBateau}}</th>
 		</tr>
@@ -31,6 +71,7 @@
 		<tr>
 			<th>Origine</th>
 			<th>{{ville}}</th>
+>>>>>>> 61d0bb5f79632cfca295415fba8312c0abc41cf5
 		</tr>
 	</tbody></table>
 	<p>

Origine	{{ville}}
Nom	{{NomBateau}}
Constructeur	{{nom}}
Dimensions	{{Dimensions}}
Installation	{{Date}}
Condamnation	{{Date}}
Origine	{{ville}}	Nom	{{NomBateau}}