diff --git a/lib_client_base/client_commands.mli b/lib_client_base/client_commands.mli
index 4ebdb8fa9..027bfceb5 100644
--- a/lib_client_base/client_commands.mli
+++ b/lib_client_base/client_commands.mli
@@ -48,7 +48,6 @@ class type full_context = object
   inherit block
 end
 (** The [full_context] allows the client {!command} handlers to work in
->>>>>>> 3ab6ecd4... Client library refactor
      various modes (command line, batch mode, web client, etc.) by
      abstracting some basic operations such as logging and reading
      configuration options. It is passed as parameter to the command
diff --git a/lib_embedded_client_alpha/michelson_macros.ml b/lib_embedded_client_alpha/michelson_macros.ml
index f88782ad9..1e159a112 100644
--- a/lib_embedded_client_alpha/michelson_macros.ml
+++ b/lib_embedded_client_alpha/michelson_macros.ml
@@ -375,7 +375,7 @@ let expand_compare original =
   | Prim (loc, "CMPGE", [], None) ->
       cmp loc [ "COMPARE" ; "GE" ]
   | Prim (_, ("CMPEQ" |  "CMPNEQ" |  "CMPLT"
-               |  "CMPGT" |  "CMPLE" | "CMPGE" as str), args, None) ->
+             |  "CMPGT" |  "CMPLE" | "CMPGE" as str), args, None) ->
       error (Invalid_arity (str, List.length args, 0))
   | Prim (loc, "IFCMPEQ", [ l ; r ], None) ->
       ifcmp loc [ "COMPARE" ; "EQ" ] l r
@@ -402,16 +402,16 @@ let expand_compare original =
   | Prim (loc, "IFGE", [ l ; r ], None) ->
       ifcmp loc [ "GE" ] l r
   | Prim (_, ("IFCMPEQ" | "IFCMPNEQ" | "IFCMPLT"
-               | "IFCMPGT" | "IFCMPLE" | "IFCMPGE"
-               | "IFEQ" | "IFNEQ" | "IFLT"
-               | "IFGT" | "IFLE" | "IFGE" as str), args, None) ->
+             | "IFCMPGT" | "IFCMPLE" | "IFCMPGE"
+             | "IFEQ" | "IFNEQ" | "IFLT"
+             | "IFGT" | "IFLE" | "IFGE" as str), args, None) ->
       error (Invalid_arity (str, List.length args, 2))
   | Prim (_, ("IFCMPEQ" | "IFCMPNEQ" | "IFCMPLT"
-               | "IFCMPGT" | "IFCMPLE" | "IFCMPGE"
-               | "IFEQ" | "IFNEQ" | "IFLT"
-               | "IFGT" | "IFLE" | "IFGE"
-               | "CMPEQ" |  "CMPNEQ" |  "CMPLT"
-               | "CMPGT" |  "CMPLE" | "CMPGE" as str), [], Some _) ->
+             | "IFCMPGT" | "IFCMPLE" | "IFCMPGE"
+             | "IFEQ" | "IFNEQ" | "IFLT"
+             | "IFGT" | "IFLE" | "IFGE"
+             | "CMPEQ" |  "CMPNEQ" |  "CMPLT"
+             | "CMPGT" |  "CMPLE" | "CMPGE" as str), [], Some _) ->
       error (Unexpected_macro_annotation str)
   | _ -> ok None
 
diff --git a/lib_node_p2p/p2p.ml b/lib_node_p2p/p2p.ml
index 3b1c358b4..7a06d6c92 100644
--- a/lib_node_p2p/p2p.ml
+++ b/lib_node_p2p/p2p.ml
@@ -541,7 +541,8 @@ module RPC = struct
     let info net point =
       match net.pool with
       | None -> None
-      | Some pool -> Option.map
+      | Some pool ->
+          Option.map
             (P2p_connection_pool.Points.info pool point)
             ~f:info_of_point_info
 
diff --git a/lib_stdlib_lwt/lwt_utils.ml b/lib_stdlib_lwt/lwt_utils.ml
index d83809486..e63bdaaf8 100644
--- a/lib_stdlib_lwt/lwt_utils.ml
+++ b/lib_stdlib_lwt/lwt_utils.ml
@@ -340,7 +340,7 @@ let protect ?on_error ?canceler t =
   | Ok _ -> res
   | Error err ->
       let canceled =
-       Option.unopt_map canceler ~default:false ~f:Lwt_canceler.canceled in
+        Option.unopt_map canceler ~default:false ~f:Lwt_canceler.canceled in
       let err = if canceled then [Canceled] else err in
       match on_error with
       | None -> Lwt.return (Error err)