Resolve conflicts

Author: liam923

src/analysis/construct.ml

@@ -517,10 +517,7 @@ module Gen = struct
               let arg, name = make_arg env label tyleft in
               let value_description =
                 { val_type = tyleft;
-                  val_kind =
-                    (* CR-someday: this sort should be based on the jkind of [tyleft]. But
-                       this isn't important since this value is just used for printing. *)
-                    Val_reg (Base Value);
+                  val_kind = Val_reg;
                   val_loc = Location.none;
                   val_attributes = [];
                   val_zero_alloc = Zero_alloc.default;

src/analysis/typedtree_utils.ml

@@ -48,7 +48,7 @@ let location_of_declaration ~uid =
   let of_value_binding vb =
     let bound_idents = Typedtree.let_bound_idents_full [ vb ] in
     ListLabels.find_map
-      ~f:(fun (_, loc, _, _, uid') -> if uid = uid' then Some loc else None)
+      ~f:(fun (_, loc, _, uid') -> if uid = uid' then Some loc else None)
       bound_idents
   in
   function

src/ocaml/typing/cmt_format.ml

@@ -107,13 +107,7 @@ let iter_on_declaration f decl =
   | Value vd -> f vd.val_val.val_uid decl;
   | Value_binding vb ->
       let bound_idents = let_bound_idents_full [vb] in
-<<<<<<< janestreet/merlin-jst:merge-5.2.0minus-24
-      List.iter ~f:(fun (_, _, _, _, uid) -> f uid decl) bound_idents
-||||||| oxcaml/oxcaml:8abf835dda41a9b2949b886a0a26950d87ddc9a7
-      List.iter (fun (_, _, _, _, uid) -> f uid decl) bound_idents
-=======
-      List.iter (fun (_, _, _, uid) -> f uid decl) bound_idents
->>>>>>> oxcaml/oxcaml:996a6635f0b131d78288b07227effb84b88cd035
+      List.iter ~f:(fun (_, _, _, uid) -> f uid decl) bound_idents
   | Type td ->
       if not (Btype.is_row_name (Ident.name td.typ_id)) then
         f td.typ_type.type_uid (Type td)

src/ocaml/typing/jkind.ml

@@ -3228,18 +3228,8 @@ module Format_history = struct
       fprintf ppf
         "it's the element type (the second type parameter) for a@ block index \
          (idx or mut_idx)"
-<<<<<<< janestreet/merlin-jst:merge-5.2.0minus-24
-    | Structure_item ->
-      fprintf ppf "it's the type of something stored in a module"
-    | Signature_item -> fprintf ppf "it's the type of something in a signature"
     | Merlin ->
       fprintf ppf "merlin needed to create a fake AST node"
-||||||| oxcaml/oxcaml:8abf835dda41a9b2949b886a0a26950d87ddc9a7
-    | Structure_item ->
-      fprintf ppf "it's the type of something stored in a module"
-    | Signature_item -> fprintf ppf "it's the type of something in a signature"
-=======
->>>>>>> oxcaml/oxcaml:996a6635f0b131d78288b07227effb84b88cd035
 
   let format_concrete_legacy_creation_reason ppf :
       History.concrete_legacy_creation_reason -> unit = function
@@ -4076,15 +4066,7 @@ module Debug_printers = struct
     | Old_style_unboxed_type -> fprintf ppf "Old_style_unboxed_type"
     | Array_element -> fprintf ppf "Array_element"
     | Idx_element -> fprintf ppf "Idx_element"
-<<<<<<< janestreet/merlin-jst:merge-5.2.0minus-24
-    | Structure_item -> fprintf ppf "Structure_item"
-    | Signature_item -> fprintf ppf "Signature_item"
     | Merlin -> fprintf ppf "Merlin"
-||||||| oxcaml/oxcaml:8abf835dda41a9b2949b886a0a26950d87ddc9a7
-    | Structure_item -> fprintf ppf "Structure_item"
-    | Signature_item -> fprintf ppf "Signature_item"
-=======
->>>>>>> oxcaml/oxcaml:996a6635f0b131d78288b07227effb84b88cd035
 
   let concrete_legacy_creation_reason ppf :
       History.concrete_legacy_creation_reason -> unit = function