diff --git a/lambda/lambda.ml b/lambda/lambda.ml
index 905907a4ec0..56f03612fa0 100644
--- a/lambda/lambda.ml
+++ b/lambda/lambda.ml
@@ -436,14 +436,9 @@ and boxed_vector =
 
 and bigarray_kind =
     Pbigarray_unknown
-<<<<<<< HEAD
-  | Pbigarray_float16 | Pbigarray_float32 | Pbigarray_float64
-||||||| 2572783060
-  | Pbigarray_float32 | Pbigarray_float64
-=======
+  | Pbigarray_float16
   | Pbigarray_float32 | Pbigarray_float32_t
   | Pbigarray_float64
->>>>>>> ocaml-jst/flambda-patches
   | Pbigarray_sint8 | Pbigarray_uint8
   | Pbigarray_sint16 | Pbigarray_uint16
   | Pbigarray_int32 | Pbigarray_int64
diff --git a/lambda/translattribute.ml b/lambda/translattribute.ml
index 0cf2b49877d..ef7fe5a461b 100644
--- a/lambda/translattribute.ml
+++ b/lambda/translattribute.ml
@@ -103,7 +103,7 @@ let parse_inline_attribute attr : inline_attribute =
 let parse_inlined_attribute attr : inlined_attribute =
   match attr with
   | None -> Default_inlined
-  | Some {Parsetree.attr_name = {txt;loc}; attr_payload = payload} ->
+  | Some ({Parsetree.attr_name = {txt;loc}; attr_payload = payload} as attr) ->
     if attr_equals_builtin attr "unrolled" then begin
       (* the 'unrolled' attributes must be used as [@unrolled n]. *)
       let warning txt = Warnings.Attribute_payload
diff --git a/lambda/translprim.ml b/lambda/translprim.ml
index 0ca8f9ec5e6..6bfe290f175 100644
--- a/lambda/translprim.ml
+++ b/lambda/translprim.ml
@@ -797,17 +797,6 @@ let lookup_primitive loc ~poly_mode ~poly_sort pos p =
     | "%atomic_exchange" -> Primitive (Patomic_exchange, 2)
     | "%atomic_cas" -> Primitive (Patomic_cas, 3)
     | "%atomic_fetch_add" -> Primitive (Patomic_fetch_add, 2)
-<<<<<<< HEAD
-    | "%runstack" -> Primitive (Prunstack, 3)
-    | "%reperform" -> Primitive (Preperform, 3)
-    | "%perform" -> Primitive (Pperform, 1)
-    | "%resume" -> Primitive (Presume, 4)
-||||||| 2572783060
-    | "%runstack" -> Primitive (Prunstack, 3)
-    | "%reperform" -> Primitive (Preperform, 3)
-    | "%perform" -> Primitive (Pperform, 1)
-    | "%resume" -> Primitive (Presume, 3)
-=======
     | "%runstack" ->
       if runtime5 then Primitive (Prunstack, 3) else Unsupported Prunstack
     | "%reperform" ->
@@ -815,8 +804,7 @@ let lookup_primitive loc ~poly_mode ~poly_sort pos p =
     | "%perform" ->
       if runtime5 then Primitive (Pperform, 1) else Unsupported Pperform
     | "%resume" ->
-      if runtime5 then Primitive (Presume, 3) else Unsupported Presume
->>>>>>> ocaml-jst/flambda-patches
+      if runtime5 then Primitive (Presume, 4) else Unsupported Presume
     | "%dls_get" -> Primitive (Pdls_get, 1)
     | "%poll" -> Primitive (Ppoll, 1)
     | "%unbox_nativeint" -> Primitive(Punbox_int Pnativeint, 1)