Fix merge bugs.

bytecomp/translcore.ml

@@ -1032,8 +1032,6 @@ and transl_exp0 e =
                  [Lprim(Pmakeblock(Obj.forward_tag, Immutable, None),
                         [transl_exp e], e.exp_loc)],
                  e.exp_loc)
-            Lprim(Pmakeblock(Obj.forward_tag, Immutable, None),
-                [transl_exp e], e.exp_loc)
       (* other cases compile to a lazy block holding a function *)
       | _ ->
          let fn = Lfunction {kind = Curried; params = [Ident.create "param"];

bytecomp/typeopt.ml

@@ -30,7 +30,7 @@ let scrape_ty env ty =
         | None -> ty
         | Some ty2 -> ty2
         end
-      | _ -> desc
+      | _ -> ty
       | exception Not_found -> ty
       end
   | _ -> ty