diff --git a/jalhyd_branch b/jalhyd_branch
index 9426cd15474d33fe7b65ba1e719ff221566e36dc..5a7919cd94e67c1fcc80781c8010285f52683c8d 100644
--- a/jalhyd_branch
+++ b/jalhyd_branch
@@ -1 +1,5 @@
+<<<<<<< Updated upstream
 302-structure-ajouter-une-erreur-sur-l-ennoiement
+=======
+335-utiliser-des-identifiants-symboliques-plutot-que-numeriques-dans-les-fichiers
+>>>>>>> Stashed changes