diff --git a/flap/src/hopix/hopixTypechecker.ml b/flap/src/hopix/hopixTypechecker.ml
index 373e8f0..dc25c7a 100644
--- a/flap/src/hopix/hopixTypechecker.ml
+++ b/flap/src/hopix/hopixTypechecker.ml
@@ -158,6 +158,7 @@ and synth_sequence
   : HopixTypes.typing_environment -> expression Position.located list -> HopixTypes.aty
   =
   fun tenv elist ->
+<<<<<<< HEAD
     match elist with
     | [] -> failwith "erreur sequence"
     | [x] -> synth_expression tenv x 
@@ -167,6 +168,15 @@ and synth_sequence
       check_equal_types x.position HopixTypes.hunit x_type
       ; synth_sequence tenv l)
 
+=======
+  match elist with
+  | [] -> failwith "erreur sequence"
+  | [ x ] -> synth_expression tenv x
+  | x :: l ->
+    let x_type = synth_expression tenv x in
+    check_equal_types x.position HopixTypes.hunit x_type;
+    synth_sequence tenv l
+>>>>>>> a4910af26df56be5421c82c370bfcb6cdafae1fd
 
 and synth_define
   :  HopixTypes.typing_environment -> value_definition -> expression Position.located