diff --git a/esy.lock/index.json b/esy.lock/index.json
index f849034f..b5e80050 100644
--- a/esy.lock/index.json
+++ b/esy.lock/index.json
@@ -14,22 +14,22 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9",
+        "ocaml@4.10.1002@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9",
         "@reason-native/console@0.1.0@d41d8cd9",
-        "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.1@f5f493bc",
         "@opam/atdgen@opam:2.2.1@d73fda11",
         "@esy-ocaml/reason@3.6.2@d41d8cd9"
       ],
       "devDependencies": []
     },
-    "ocaml@4.10.0@d41d8cd9": {
-      "id": "ocaml@4.10.0@d41d8cd9",
+    "ocaml@4.10.1002@d41d8cd9": {
+      "id": "ocaml@4.10.1002@d41d8cd9",
       "name": "ocaml",
-      "version": "4.10.0",
+      "version": "4.10.1002",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.10.0.tgz#sha1:3797ee252dca8dec38d3cdd42162923f56dba433"
+          "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.10.1002.tgz#sha1:66d454c686aacfeb0372b5a9306b57aa623f2eff"
         ]
       },
       "overrides": [],
@@ -48,11 +48,11 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9",
+        "ocaml@4.10.1002@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9",
         "@reason-native/file-context-printer@0.0.3@d41d8cd9",
         "@reason-native/cli@0.0.1-alpha@d41d8cd9",
         "@opam/re@opam:1.9.0@d4d5e13d", "@opam/junit@opam:2.0.2@0b7bd730",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/reason@3.6.2@d41d8cd9"
+        "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/reason@3.6.2@d41d8cd9"
       ],
       "devDependencies": []
     },
@@ -68,8 +68,8 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/reason@3.6.2@d41d8cd9"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/reason@3.6.2@d41d8cd9"
       ],
       "devDependencies": []
     },
@@ -85,8 +85,8 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9",
-        "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9",
+        "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.1@f5f493bc",
         "@esy-ocaml/reason@3.6.2@d41d8cd9"
       ],
       "devDependencies": []
@@ -103,7 +103,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc",
         "@esy-ocaml/reason@3.6.2@d41d8cd9"
       ],
       "devDependencies": []
@@ -120,8 +120,8 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9",
-        "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9",
+        "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.1@f5f493bc",
         "@esy-ocaml/reason@3.6.2@d41d8cd9"
       ],
       "devDependencies": []
@@ -137,21 +137,21 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9",
+        "ocaml@4.10.1002@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9",
         "@opam/yojson@opam:1.7.0@7056d985",
         "@opam/sexplib@opam:v0.13.0@79086695",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/dune@opam:2.7.0@50e8f3e0",
+        "@opam/dune@opam:2.7.1@f5f493bc",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@esy-ocaml/reason@3.6.2@d41d8cd9"
       ],
       "devDependencies": [
-        "refmterr@3.3.2@d41d8cd9", "ocaml@4.10.0@d41d8cd9",
+        "refmterr@3.3.2@d41d8cd9", "ocaml@4.10.1002@d41d8cd9",
         "@reason-native/rely@3.2.1@d41d8cd9",
         "@opam/odoc@opam:1.5.1@52a58c0b",
         "@opam/ocamlformat@opam:0.12@c6954cd5",
-        "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#a66d82aff86b162423b1657b38f7c4dcc5867ff1@d41d8cd9",
-        "@opam/merlin@opam:3.3.9@e0b69f63", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#94e2c424b0c59bf387bc95bb0af9a81730de79fa@d41d8cd9",
+        "@opam/merlin@opam:3.4.1@da518877", "@opam/dune@opam:2.7.1@f5f493bc",
         "@opam/bos@opam:0.2.0@df49e63f"
       ]
     },
@@ -173,14 +173,14 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/cppo@opam:1.6.6@f4f83858",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@opam/cppo@opam:1.6.6@f4f83858",
         "@opam/biniou@opam:1.2.1@d7570399",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/biniou@opam:1.2.1@d7570399"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@opam/biniou@opam:1.2.1@d7570399"
       ]
     },
     "@opam/uutf@opam:1.0.2@4440868f": {
@@ -201,15 +201,15 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea",
-        "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea",
+        "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea"
       ]
     },
     "@opam/uuseg@opam:13.0.0@f60712a7": {
@@ -230,15 +230,15 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
-        "@opam/uucp@opam:13.0.0@e9b515e0", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
+        "@opam/uucp@opam:13.0.0@e9b515e0", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/uucp@opam:13.0.0@e9b515e0"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/uucp@opam:13.0.0@e9b515e0"
       ]
     },
     "@opam/uucp@opam:13.0.0@e9b515e0": {
@@ -259,14 +259,14 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
-        "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
+        "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
+      "devDependencies": [ "ocaml@4.10.1002@d41d8cd9" ]
     },
     "@opam/uchar@opam:0.0.2@c8218eea": {
       "id": "@opam/uchar@opam:0.0.2@c8218eea",
@@ -286,10 +286,10 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
+      "devDependencies": [ "ocaml@4.10.1002@d41d8cd9" ]
     },
     "@opam/tyxml@opam:4.4.0@1dca5713": {
       "id": "@opam/tyxml@opam:4.4.0@1dca5713",
@@ -309,40 +309,40 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
         "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
         "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/dune@opam:2.7.0@50e8f3e0"
+        "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
-    "@opam/topkg@opam:1.0.2@3c5942ad": {
-      "id": "@opam/topkg@opam:1.0.2@3c5942ad",
+    "@opam/topkg@opam:1.0.3@e4e10f1c": {
+      "id": "@opam/topkg@opam:1.0.3@e4e10f1c",
       "name": "@opam/topkg",
-      "version": "opam:1.0.2",
+      "version": "opam:1.0.3",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/b4/b4925b2c37f73f8f0b79ea07ab15ff67#md5:b4925b2c37f73f8f0b79ea07ab15ff67",
-          "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.2.tbz#md5:b4925b2c37f73f8f0b79ea07ab15ff67"
+          "archive:https://opam.ocaml.org/cache/md5/e2/e285f7a296d77ee7d831ba9a6bfb396f#md5:e285f7a296d77ee7d831ba9a6bfb396f",
+          "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz#md5:e285f7a296d77ee7d831ba9a6bfb396f"
         ],
         "opam": {
           "name": "topkg",
-          "version": "1.0.2",
-          "path": "esy.lock/opam/topkg.1.0.2"
+          "version": "1.0.3",
+          "path": "esy.lock/opam/topkg.1.0.3"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03"
       ]
     },
     "@opam/stdlib-shims@opam:0.1.0@8c116481": {
@@ -363,11 +363,11 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
     "@opam/stdio@opam:v0.13.0@eb59d879": {
@@ -388,13 +388,13 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0",
-        "@opam/base@opam:v0.13.2@c3150775",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc",
+        "@opam/base@opam:v0.13.2@5ac9ab39",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0",
-        "@opam/base@opam:v0.13.2@c3150775"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc",
+        "@opam/base@opam:v0.13.2@5ac9ab39"
       ]
     },
     "@opam/sexplib0@opam:v0.13.0@3f54c2be": {
@@ -415,11 +415,11 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
     "@opam/sexplib@opam:v0.13.0@79086695": {
@@ -440,14 +440,14 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.13.0@3f54c2be",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/sexplib0@opam:v0.13.0@3f54c2be",
         "@opam/parsexp@opam:v0.13.0@5b4df040", "@opam/num@opam:1.3@43fe4f7f",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.13.0@3f54c2be",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/sexplib0@opam:v0.13.0@3f54c2be",
         "@opam/parsexp@opam:v0.13.0@5b4df040", "@opam/num@opam:1.3@43fe4f7f",
-        "@opam/dune@opam:2.7.0@50e8f3e0"
+        "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
     "@opam/seq@opam:base@d8d7de1d": {
@@ -465,9 +465,9 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.10.1002@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
+      "devDependencies": [ "ocaml@4.10.1002@d41d8cd9" ]
     },
     "@opam/rresult@opam:0.6.0@4b185e72": {
       "id": "@opam/rresult@opam:0.6.0@4b185e72",
@@ -487,14 +487,14 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/result@opam:1.5@6b753c82"
       ]
     },
     "@opam/result@opam:1.5@6b753c82": {
@@ -515,11 +515,11 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
     "@opam/re@opam:1.9.0@d4d5e13d": {
@@ -540,12 +540,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/seq@opam:base@d8d7de1d",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d",
-        "@opam/dune@opam:2.7.0@50e8f3e0"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/seq@opam:base@d8d7de1d",
+        "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
     "@opam/ptime@opam:0.8.5@0051d642": {
@@ -566,14 +566,14 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/result@opam:1.5@6b753c82"
       ]
     },
     "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6": {
@@ -594,12 +594,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
-        "@opam/dune@opam:2.7.0@50e8f3e0"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
     "@opam/ppx_derivers@opam:1.2.1@ecf0aa45": {
@@ -620,11 +620,11 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
     "@opam/parsexp@opam:v0.13.0@5b4df040": {
@@ -645,13 +645,13 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.13.0@3f54c2be",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base@opam:v0.13.2@c3150775",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/sexplib0@opam:v0.13.0@3f54c2be",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@opam/base@opam:v0.13.2@5ac9ab39",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.13.0@3f54c2be",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base@opam:v0.13.2@c3150775"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/sexplib0@opam:v0.13.0@3f54c2be",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@opam/base@opam:v0.13.2@5ac9ab39"
       ]
     },
     "@opam/odoc@opam:1.5.1@52a58c0b": {
@@ -672,17 +672,17 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/tyxml@opam:4.4.0@1dca5713",
-        "@opam/result@opam:1.5@6b753c82", "@opam/fpath@opam:0.7.2@45477b93",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/cppo@opam:1.6.6@f4f83858",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/tyxml@opam:4.4.0@1dca5713",
+        "@opam/result@opam:1.5@6b753c82", "@opam/fpath@opam:0.7.3@674d8125",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@opam/cppo@opam:1.6.6@f4f83858",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/astring@opam:0.8.5@1300cee8",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/tyxml@opam:4.4.0@1dca5713",
-        "@opam/result@opam:1.5@6b753c82", "@opam/fpath@opam:0.7.2@45477b93",
-        "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/tyxml@opam:4.4.0@1dca5713",
+        "@opam/result@opam:1.5@6b753c82", "@opam/fpath@opam:0.7.3@674d8125",
+        "@opam/dune@opam:2.7.1@f5f493bc",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/astring@opam:0.8.5@1300cee8"
       ]
@@ -705,27 +705,27 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
         "@opam/uuseg@opam:13.0.0@f60712a7",
         "@opam/stdio@opam:v0.13.0@eb59d879", "@opam/re@opam:1.9.0@d4d5e13d",
         "@opam/odoc@opam:1.5.1@52a58c0b",
         "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47",
-        "@opam/fpath@opam:0.7.2@45477b93", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "@opam/fpath@opam:0.7.3@674d8125", "@opam/dune@opam:2.7.1@f5f493bc",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/base-unix@opam:base@87d0b2eb",
-        "@opam/base@opam:v0.13.2@c3150775",
+        "@opam/base@opam:v0.13.2@5ac9ab39",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
         "@opam/uuseg@opam:13.0.0@f60712a7",
         "@opam/stdio@opam:v0.13.0@eb59d879", "@opam/re@opam:1.9.0@d4d5e13d",
         "@opam/odoc@opam:1.5.1@52a58c0b",
         "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47",
-        "@opam/fpath@opam:0.7.2@45477b93", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "@opam/fpath@opam:0.7.3@674d8125", "@opam/dune@opam:2.7.1@f5f493bc",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/base-unix@opam:base@87d0b2eb",
-        "@opam/base@opam:v0.13.2@c3150775"
+        "@opam/base@opam:v0.13.2@5ac9ab39"
       ]
     },
     "@opam/ocamlfind@opam:1.8.1@ff07b0f9": {
@@ -752,10 +752,10 @@
         }
       ],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/conf-m4@opam:1@3b2b148a",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/conf-m4@opam:1@3b2b148a",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
+      "devDependencies": [ "ocaml@4.10.1002@d41d8cd9" ]
     },
     "@opam/ocamlbuild@opam:0.14.0@6ac75d03": {
       "id": "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -780,9 +780,9 @@
         }
       ],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.10.1002@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
+      "devDependencies": [ "ocaml@4.10.1002@d41d8cd9" ]
     },
     "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47": {
       "id": "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47",
@@ -802,49 +802,49 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
-        "@opam/dune@opam:2.7.0@50e8f3e0"
+        "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
-    "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#a66d82aff86b162423b1657b38f7c4dcc5867ff1@d41d8cd9": {
+    "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#94e2c424b0c59bf387bc95bb0af9a81730de79fa@d41d8cd9": {
       "id":
-        "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#a66d82aff86b162423b1657b38f7c4dcc5867ff1@d41d8cd9",
+        "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#94e2c424b0c59bf387bc95bb0af9a81730de79fa@d41d8cd9",
       "name": "@opam/ocaml-lsp-server",
       "version":
-        "github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#a66d82aff86b162423b1657b38f7c4dcc5867ff1",
+        "github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#94e2c424b0c59bf387bc95bb0af9a81730de79fa",
       "source": {
         "type": "install",
         "source": [
-          "github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#a66d82aff86b162423b1657b38f7c4dcc5867ff1"
+          "github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#94e2c424b0c59bf387bc95bb0af9a81730de79fa"
         ]
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
         "@opam/stdlib-shims@opam:0.1.0@8c116481",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/dune-build-info@opam:2.7.0@a5897ded",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/csexp@opam:1.3.1@5165cf17",
+        "@opam/dune-build-info@opam:2.7.1@da03d61d",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
         "@opam/stdlib-shims@opam:0.1.0@8c116481",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/dune-build-info@opam:2.7.0@a5897ded",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/csexp@opam:1.3.1@5165cf17"
+        "@opam/dune-build-info@opam:2.7.1@da03d61d",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af"
       ]
     },
     "@opam/num@opam:1.3@43fe4f7f": {
@@ -870,10 +870,10 @@
         }
       ],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
+      "devDependencies": [ "ocaml@4.10.1002@d41d8cd9" ]
     },
     "@opam/merlin-extend@opam:0.6@404f814c": {
       "id": "@opam/merlin-extend@opam:0.6@404f814c",
@@ -893,39 +893,41 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc",
         "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
-    "@opam/merlin@opam:3.3.9@e0b69f63": {
-      "id": "@opam/merlin@opam:3.3.9@e0b69f63",
+    "@opam/merlin@opam:3.4.1@da518877": {
+      "id": "@opam/merlin@opam:3.4.1@da518877",
       "name": "@opam/merlin",
-      "version": "opam:3.3.9",
+      "version": "opam:3.4.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/a3/a3170f1a993d810d552a21a4baa328dff0fe9ac9bf4b8aa6ba3f179a9240cf02#sha256:a3170f1a993d810d552a21a4baa328dff0fe9ac9bf4b8aa6ba3f179a9240cf02",
-          "archive:https://github.com/ocaml/merlin/releases/download/v3.3.9/merlin-v3.3.9.tbz#sha256:a3170f1a993d810d552a21a4baa328dff0fe9ac9bf4b8aa6ba3f179a9240cf02"
+          "archive:https://opam.ocaml.org/cache/sha256/e7/e7f28ca520d1ab4a58e8ba876b665b1ecf9917cee7e5b3e3330afbd1d12a9e2a#sha256:e7f28ca520d1ab4a58e8ba876b665b1ecf9917cee7e5b3e3330afbd1d12a9e2a",
+          "archive:https://github.com/ocaml/merlin/releases/download/v3.4.1/merlin-v3.4.1.tbz#sha256:e7f28ca520d1ab4a58e8ba876b665b1ecf9917cee7e5b3e3330afbd1d12a9e2a"
         ],
         "opam": {
           "name": "merlin",
-          "version": "3.3.9",
-          "path": "esy.lock/opam/merlin.3.3.9"
+          "version": "3.4.1",
+          "path": "esy.lock/opam/merlin.3.4.1"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
-        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.7.1@f5f493bc",
+        "@opam/dot-merlin-reader@opam:3.4.1@72503a75",
+        "@opam/csexp@opam:1.3.2@5cea14af", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
-        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/dune@opam:2.7.0@50e8f3e0"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.7.1@f5f493bc",
+        "@opam/dot-merlin-reader@opam:3.4.1@72503a75",
+        "@opam/csexp@opam:1.3.2@5cea14af"
       ]
     },
     "@opam/menhirSdk@opam:20200624@2a05b5a7": {
@@ -946,11 +948,11 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
     "@opam/menhirLib@opam:20200624@8bdd2b0e": {
@@ -971,11 +973,11 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
     "@opam/menhir@opam:20200624@8629ff13": {
@@ -996,14 +998,14 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7",
         "@opam/menhirLib@opam:20200624@8bdd2b0e",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7",
         "@opam/menhirLib@opam:20200624@8bdd2b0e",
-        "@opam/dune@opam:2.7.0@50e8f3e0"
+        "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
     "@opam/logs@opam:0.7.0@1d03143e": {
@@ -1024,15 +1026,15 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
-        "@opam/fmt@opam:0.8.8@01c3a23c",
+        "@opam/fmt@opam:0.8.9@e0843a5b",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/base-threads@opam:base@36803084",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
+      "devDependencies": [ "ocaml@4.10.1002@d41d8cd9" ]
     },
     "@opam/junit@opam:2.0.2@0b7bd730": {
       "id": "@opam/junit@opam:2.0.2@0b7bd730",
@@ -1053,62 +1055,60 @@
       "overrides": [],
       "dependencies": [
         "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/ptime@opam:0.8.5@0051d642",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/ptime@opam:0.8.5@0051d642",
-        "@opam/dune@opam:2.7.0@50e8f3e0"
+        "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
-    "@opam/fpath@opam:0.7.2@45477b93": {
-      "id": "@opam/fpath@opam:0.7.2@45477b93",
+    "@opam/fpath@opam:0.7.3@674d8125": {
+      "id": "@opam/fpath@opam:0.7.3@674d8125",
       "name": "@opam/fpath",
-      "version": "opam:0.7.2",
+      "version": "opam:0.7.3",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/52/52c7ecb0bf180088336f3c645875fa41#md5:52c7ecb0bf180088336f3c645875fa41",
-          "archive:http://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz#md5:52c7ecb0bf180088336f3c645875fa41"
+          "archive:https://opam.ocaml.org/cache/md5/07/0740b530e8fed5b0adc5eee8463cfc2f#md5:0740b530e8fed5b0adc5eee8463cfc2f",
+          "archive:https://erratique.ch/software/fpath/releases/fpath-0.7.3.tbz#md5:0740b530e8fed5b0adc5eee8463cfc2f"
         ],
         "opam": {
           "name": "fpath",
-          "version": "0.7.2",
-          "path": "esy.lock/opam/fpath.0.7.2"
+          "version": "0.7.3",
+          "path": "esy.lock/opam/fpath.0.7.3"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
-        "@opam/result@opam:1.5@6b753c82",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/astring@opam:0.8.5@1300cee8",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/astring@opam:0.8.5@1300cee8"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/astring@opam:0.8.5@1300cee8"
       ]
     },
-    "@opam/fmt@opam:0.8.8@01c3a23c": {
-      "id": "@opam/fmt@opam:0.8.8@01c3a23c",
+    "@opam/fmt@opam:0.8.9@e0843a5b": {
+      "id": "@opam/fmt@opam:0.8.9@e0843a5b",
       "name": "@opam/fmt",
-      "version": "opam:0.8.8",
+      "version": "opam:0.8.9",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/47/473490fcfdf3ff0a8ccee226b873d4b2#md5:473490fcfdf3ff0a8ccee226b873d4b2",
-          "archive:https://erratique.ch/software/fmt/releases/fmt-0.8.8.tbz#md5:473490fcfdf3ff0a8ccee226b873d4b2"
+          "archive:https://opam.ocaml.org/cache/md5/40/4001b51cde90ea4fd99a4a5033ecf411#md5:4001b51cde90ea4fd99a4a5033ecf411",
+          "archive:https://erratique.ch/software/fmt/releases/fmt-0.8.9.tbz#md5:4001b51cde90ea4fd99a4a5033ecf411"
         ],
         "opam": {
           "name": "fmt",
-          "version": "0.8.8",
-          "path": "esy.lock/opam/fmt.0.8.8"
+          "version": "0.8.9",
+          "path": "esy.lock/opam/fmt.0.8.9"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/stdlib-shims@opam:0.1.0@8c116481",
         "@opam/seq@opam:base@d8d7de1d",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
@@ -1118,7 +1118,7 @@
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481",
         "@opam/seq@opam:base@d8d7de1d"
       ]
     },
@@ -1140,11 +1140,11 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
     "@opam/easy-format@opam:1.3.2@0484b3c4": {
@@ -1165,116 +1165,149 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
-    "@opam/dune-configurator@opam:2.7.0@bd860a0f": {
-      "id": "@opam/dune-configurator@opam:2.7.0@bd860a0f",
+    "@opam/dune-configurator@opam:2.7.1@96307faa": {
+      "id": "@opam/dune-configurator@opam:2.7.1@96307faa",
       "name": "@opam/dune-configurator",
-      "version": "opam:2.7.0",
+      "version": "opam:2.7.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/b4/b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15",
-          "archive:https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15"
+          "archive:https://opam.ocaml.org/cache/sha256/c3/c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d#sha256:c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d",
+          "archive:https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz#sha256:c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d"
         ],
         "opam": {
           "name": "dune-configurator",
-          "version": "2.7.0",
-          "path": "esy.lock/opam/dune-configurator.2.7.0"
+          "version": "2.7.1",
+          "path": "esy.lock/opam/dune-configurator.2.7.1"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af"
       ]
     },
-    "@opam/dune-build-info@opam:2.7.0@a5897ded": {
-      "id": "@opam/dune-build-info@opam:2.7.0@a5897ded",
+    "@opam/dune-build-info@opam:2.7.1@da03d61d": {
+      "id": "@opam/dune-build-info@opam:2.7.1@da03d61d",
       "name": "@opam/dune-build-info",
-      "version": "opam:2.7.0",
+      "version": "opam:2.7.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/b4/b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15",
-          "archive:https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15"
+          "archive:https://opam.ocaml.org/cache/sha256/c3/c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d#sha256:c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d",
+          "archive:https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz#sha256:c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d"
         ],
         "opam": {
           "name": "dune-build-info",
-          "version": "2.7.0",
-          "path": "esy.lock/opam/dune-build-info.2.7.0"
+          "version": "2.7.1",
+          "path": "esy.lock/opam/dune-build-info.2.7.1"
         }
       },
       "overrides": [],
       "dependencies": [
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "@opam/dune@opam:2.7.0@50e8f3e0" ]
+      "devDependencies": [ "@opam/dune@opam:2.7.1@f5f493bc" ]
     },
-    "@opam/dune@opam:2.7.0@50e8f3e0": {
-      "id": "@opam/dune@opam:2.7.0@50e8f3e0",
+    "@opam/dune@opam:2.7.1@f5f493bc": {
+      "id": "@opam/dune@opam:2.7.1@f5f493bc",
       "name": "@opam/dune",
-      "version": "opam:2.7.0",
+      "version": "opam:2.7.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/b4/b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15",
-          "archive:https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15"
+          "archive:https://opam.ocaml.org/cache/sha256/c3/c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d#sha256:c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d",
+          "archive:https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz#sha256:c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d"
         ],
         "opam": {
           "name": "dune",
-          "version": "2.7.0",
-          "path": "esy.lock/opam/dune.2.7.0"
+          "version": "2.7.1",
+          "path": "esy.lock/opam/dune.2.7.1"
         }
       },
       "overrides": [
         {
           "opamoverride":
-            "esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override"
+            "esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override"
         }
       ],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/base-threads@opam:base@36803084",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/base-threads@opam:base@36803084"
       ]
     },
-    "@opam/csexp@opam:1.3.1@5165cf17": {
-      "id": "@opam/csexp@opam:1.3.1@5165cf17",
+    "@opam/dot-merlin-reader@opam:3.4.1@72503a75": {
+      "id": "@opam/dot-merlin-reader@opam:3.4.1@72503a75",
+      "name": "@opam/dot-merlin-reader",
+      "version": "opam:3.4.1",
+      "source": {
+        "type": "install",
+        "source": [
+          "archive:https://opam.ocaml.org/cache/sha256/e7/e7f28ca520d1ab4a58e8ba876b665b1ecf9917cee7e5b3e3330afbd1d12a9e2a#sha256:e7f28ca520d1ab4a58e8ba876b665b1ecf9917cee7e5b3e3330afbd1d12a9e2a",
+          "archive:https://github.com/ocaml/merlin/releases/download/v3.4.1/merlin-v3.4.1.tbz#sha256:e7f28ca520d1ab4a58e8ba876b665b1ecf9917cee7e5b3e3330afbd1d12a9e2a"
+        ],
+        "opam": {
+          "name": "dot-merlin-reader",
+          "version": "3.4.1",
+          "path": "esy.lock/opam/dot-merlin-reader.3.4.1"
+        }
+      },
+      "overrides": [],
+      "dependencies": [
+        "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "@opam/result@opam:1.5@6b753c82",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af",
+        "@esy-ocaml/substs@0.0.1@d41d8cd9"
+      ],
+      "devDependencies": [
+        "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "@opam/result@opam:1.5@6b753c82",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af"
+      ]
+    },
+    "@opam/csexp@opam:1.3.2@5cea14af": {
+      "id": "@opam/csexp@opam:1.3.2@5cea14af",
       "name": "@opam/csexp",
-      "version": "opam:1.3.1",
+      "version": "opam:1.3.2",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/89/89e8c4181dc13e99cf67ddf2e258ea334352470e65b39041e62b61bcf0825155#sha256:89e8c4181dc13e99cf67ddf2e258ea334352470e65b39041e62b61bcf0825155",
-          "archive:https://github.com/ocaml-dune/csexp/releases/download/1.3.1/csexp-1.3.1.tbz#sha256:89e8c4181dc13e99cf67ddf2e258ea334352470e65b39041e62b61bcf0825155"
+          "archive:https://opam.ocaml.org/cache/sha256/f2/f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a",
+          "archive:https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a"
         ],
         "opam": {
           "name": "csexp",
-          "version": "1.3.1",
-          "path": "esy.lock/opam/csexp.1.3.1"
+          "version": "1.3.2",
+          "path": "esy.lock/opam/csexp.1.3.2"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/dune@opam:2.7.0@50e8f3e0"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
+        "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
     "@opam/cppo@opam:1.6.6@f4f83858": {
@@ -1295,12 +1328,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc",
         "@opam/base-unix@opam:base@87d0b2eb",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc",
         "@opam/base-unix@opam:base@87d0b2eb"
       ]
     },
@@ -1339,9 +1372,9 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.10.1002@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
+      "devDependencies": [ "ocaml@4.10.1002@d41d8cd9" ]
     },
     "@opam/bos@opam:0.2.0@df49e63f": {
       "id": "@opam/bos@opam:0.2.0@df49e63f",
@@ -1361,20 +1394,20 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/rresult@opam:0.6.0@4b185e72",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
-        "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.2@45477b93",
-        "@opam/fmt@opam:0.8.8@01c3a23c",
+        "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.3@674d8125",
+        "@opam/fmt@opam:0.8.9@e0843a5b",
         "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/astring@opam:0.8.5@1300cee8",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/rresult@opam:0.6.0@4b185e72",
-        "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.2@45477b93",
-        "@opam/fmt@opam:0.8.8@01c3a23c",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/rresult@opam:0.6.0@4b185e72",
+        "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.3@674d8125",
+        "@opam/fmt@opam:0.8.9@e0843a5b",
         "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/astring@opam:0.8.5@1300cee8"
       ]
@@ -1397,12 +1430,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4",
-        "@opam/dune@opam:2.7.0@50e8f3e0"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4",
+        "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
     "@opam/base-unix@opam:base@87d0b2eb": {
@@ -1439,8 +1472,8 @@
       "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ],
       "devDependencies": []
     },
-    "@opam/base@opam:v0.13.2@c3150775": {
-      "id": "@opam/base@opam:v0.13.2@c3150775",
+    "@opam/base@opam:v0.13.2@5ac9ab39": {
+      "id": "@opam/base@opam:v0.13.2@5ac9ab39",
       "name": "@opam/base",
       "version": "opam:v0.13.2",
       "source": {
@@ -1457,14 +1490,14 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.13.0@3f54c2be",
-        "@opam/dune-configurator@opam:2.7.0@bd860a0f",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/sexplib0@opam:v0.13.0@3f54c2be",
+        "@opam/dune-configurator@opam:2.7.1@96307faa",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.13.0@3f54c2be",
-        "@opam/dune-configurator@opam:2.7.0@bd860a0f",
-        "@opam/dune@opam:2.7.0@50e8f3e0"
+        "ocaml@4.10.1002@d41d8cd9", "@opam/sexplib0@opam:v0.13.0@3f54c2be",
+        "@opam/dune-configurator@opam:2.7.1@96307faa",
+        "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
     "@opam/atdgen-runtime@opam:2.2.1@6a3a6395": {
@@ -1485,14 +1518,14 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
-        "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.1@f5f493bc",
         "@opam/biniou@opam:1.2.1@d7570399",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
-        "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.0@50e8f3e0",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.1@f5f493bc",
         "@opam/biniou@opam:1.2.1@d7570399"
       ]
     },
@@ -1514,14 +1547,14 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/biniou@opam:1.2.1@d7570399",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@opam/biniou@opam:1.2.1@d7570399",
         "@opam/atdgen-runtime@opam:2.2.1@6a3a6395",
         "@opam/atd@opam:2.2.1@071ab6bd", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/biniou@opam:1.2.1@d7570399",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "@opam/dune@opam:2.7.1@f5f493bc", "@opam/biniou@opam:1.2.1@d7570399",
         "@opam/atdgen-runtime@opam:2.2.1@6a3a6395",
         "@opam/atd@opam:2.2.1@071ab6bd"
       ]
@@ -1544,16 +1577,16 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d",
         "@opam/menhir@opam:20200624@8629ff13",
         "@opam/easy-format@opam:1.3.2@0484b3c4",
-        "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d",
         "@opam/menhir@opam:20200624@8629ff13",
         "@opam/easy-format@opam:1.3.2@0484b3c4",
-        "@opam/dune@opam:2.7.0@50e8f3e0"
+        "@opam/dune@opam:2.7.1@f5f493bc"
       ]
     },
     "@opam/astring@opam:0.8.5@1300cee8": {
@@ -1574,12 +1607,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
+      "devDependencies": [ "ocaml@4.10.1002@d41d8cd9" ]
     },
     "@esy-ocaml/substs@0.0.1@d41d8cd9": {
       "id": "@esy-ocaml/substs@0.0.1@d41d8cd9",
@@ -1607,12 +1640,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
+        "ocaml@4.10.1002@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/merlin-extend@opam:0.6@404f814c",
         "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.7.0@50e8f3e0"
+        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.7.1@f5f493bc"
       ],
       "devDependencies": []
     }
diff --git a/esy.lock/opam/base.v0.13.2/opam b/esy.lock/opam/base.v0.13.2/opam
index 3f65d55c..3e70a0d4 100644
--- a/esy.lock/opam/base.v0.13.2/opam
+++ b/esy.lock/opam/base.v0.13.2/opam
@@ -10,7 +10,7 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "ocaml"    {>= "4.04.2"}
+  "ocaml"    {>= "4.04.2" & < "4.12"}
   "sexplib0" {>= "v0.13" & < "v0.14"}
   "dune"     {>= "1.5.1"}
   "dune-configurator"
diff --git a/esy.lock/opam/csexp.1.3.1/opam b/esy.lock/opam/csexp.1.3.2/opam
similarity index 76%
rename from esy.lock/opam/csexp.1.3.1/opam
rename to esy.lock/opam/csexp.1.3.2/opam
index f7a97c2d..1508d17a 100644
--- a/esy.lock/opam/csexp.1.3.1/opam
+++ b/esy.lock/opam/csexp.1.3.2/opam
@@ -28,11 +28,11 @@ homepage: "https://github.com/ocaml-dune/csexp"
 doc: "https://ocaml-dune.github.io/csexp/"
 bug-reports: "https://github.com/ocaml-dune/csexp/issues"
 depends: [
-  "dune" {>= "2.5"}
+  "dune" {>= "1.11"}
   "ocaml" {>= "4.02.3"}
-  "ppx_expect" {with-test}
   "result" {>= "1.5"}
 ]
+dev-repo: "git+https://github.com/ocaml-dune/csexp.git"
 build: [
   ["dune" "subst"] {pinned}
   [
@@ -43,16 +43,16 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test}
+#   "@runtest" {with-test & ocaml:version >= "4.04"}
     "@doc" {with-doc}
   ]
 ]
-dev-repo: "git+https://github.com/ocaml-dune/csexp.git"
+x-commit-hash: "19a2e7bc171a707059c73d78dd18e4e3ff03ac9b"
 url {
   src:
-    "https://github.com/ocaml-dune/csexp/releases/download/1.3.1/csexp-1.3.1.tbz"
+    "https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz"
   checksum: [
-    "sha256=89e8c4181dc13e99cf67ddf2e258ea334352470e65b39041e62b61bcf0825155"
-    "sha512=dd6b3894529c828926ee05070548125822ad3bee8324623de0188d49655439286343f8cbc2ede8a27e01af5715e3bc1e643d6a0d770061b384d6dcefdb545eb2"
+    "sha256=f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a"
+    "sha512=ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026"
   ]
 }
diff --git a/esy.lock/opam/dot-merlin-reader.3.4.1/opam b/esy.lock/opam/dot-merlin-reader.3.4.1/opam
new file mode 100644
index 00000000..4fd7ac88
--- /dev/null
+++ b/esy.lock/opam/dot-merlin-reader.3.4.1/opam
@@ -0,0 +1,28 @@
+opam-version: "2.0"
+maintainer:   "defree@gmail.com"
+authors:      "The Merlin team"
+synopsis:     "Reads config files for merlin"
+homepage:     "https://github.com/ocaml/merlin"
+bug-reports:  "https://github.com/ocaml/merlin/issues"
+dev-repo: "git+https://github.com/ocaml/merlin.git"
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml" {>= "4.02.1"}
+  "dune" {>= "1.8.0"}
+  "yojson" {>= "1.6.0"}
+  "ocamlfind" {>= "1.6.0"}
+  "csexp" {>= "1.2.3"}
+  "result" {>= "1.5"}
+]
+x-commit-hash: "35dd6b466dce1f542de82e5c6df0bff94e394fe1"
+url {
+  src:
+    "https://github.com/ocaml/merlin/releases/download/v3.4.1/merlin-v3.4.1.tbz"
+  checksum: [
+    "sha256=e7f28ca520d1ab4a58e8ba876b665b1ecf9917cee7e5b3e3330afbd1d12a9e2a"
+    "sha512=40ae93397aea031c1b4450998b448fc1df9671d612be0a02986688e5dd1390ced1c31bb2cdde9c6b52f8be841ca9fd1931fc302b26ef19cb2e88925d3b360c37"
+  ]
+}
diff --git a/esy.lock/opam/dune-build-info.2.7.0/opam b/esy.lock/opam/dune-build-info.2.7.1/opam
similarity index 73%
rename from esy.lock/opam/dune-build-info.2.7.0/opam
rename to esy.lock/opam/dune-build-info.2.7.1/opam
index ea2f6aa1..c9130976 100644
--- a/esy.lock/opam/dune-build-info.2.7.0/opam
+++ b/esy.lock/opam/dune-build-info.2.7.1/opam
@@ -32,10 +32,11 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-commit-hash: "5472766b2448308a7160dfd0fca1ec711e124a5c"
 url {
-  src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz"
+  src: "https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz"
   checksum: [
-    "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15"
-    "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89"
+    "sha256=c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d"
+    "sha512=2b4b311824471dac8196181d7c7267f96b1b73f35341b72019f169cf6d42a19254e90bdfba2d3ecb138ad318e2e2431dd0ec6c38d9efe1da382ec95f5d9e959b"
   ]
 }
diff --git a/esy.lock/opam/dune-configurator.2.7.0/opam b/esy.lock/opam/dune-configurator.2.7.1/opam
similarity index 70%
rename from esy.lock/opam/dune-configurator.2.7.0/opam
rename to esy.lock/opam/dune-configurator.2.7.1/opam
index a247cb8d..3a02b1af 100644
--- a/esy.lock/opam/dune-configurator.2.7.0/opam
+++ b/esy.lock/opam/dune-configurator.2.7.1/opam
@@ -17,8 +17,10 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
+  "dune" {>= "2.7"}
   "ocaml" {>= "4.03.0"}
-  "dune" {>= "2.7" & >= "2.6.0"}
+  "result"
+  "csexp" {>= "1.3.0"}
   "odoc" {with-doc}
 ]
 dev-repo: "git+https://github.com/ocaml/dune.git"
@@ -35,10 +37,11 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-commit-hash: "5472766b2448308a7160dfd0fca1ec711e124a5c"
 url {
-  src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz"
+  src: "https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz"
   checksum: [
-    "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15"
-    "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89"
+    "sha256=c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d"
+    "sha512=2b4b311824471dac8196181d7c7267f96b1b73f35341b72019f169cf6d42a19254e90bdfba2d3ecb138ad318e2e2431dd0ec6c38d9efe1da382ec95f5d9e959b"
   ]
 }
diff --git a/esy.lock/opam/dune.2.7.0/opam b/esy.lock/opam/dune.2.7.1/opam
similarity index 78%
rename from esy.lock/opam/dune.2.7.0/opam
rename to esy.lock/opam/dune.2.7.1/opam
index c4b16003..aaa13e67 100644
--- a/esy.lock/opam/dune.2.7.0/opam
+++ b/esy.lock/opam/dune.2.7.1/opam
@@ -40,16 +40,17 @@ build: [
   ["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs]
 ]
 depends: [
-  # Please keep the lower bound in sync with .travis.yml, dune-project
-  # and min_ocaml_version in bootstrap.ml
+  # Please keep the lower bound in sync with .github/workflows/workflow.yml,
+  # dune-project and min_ocaml_version in bootstrap.ml
   ("ocaml" {>= "4.08"} | ("ocaml" {< "4.08~~"} & "ocamlfind-secondary"))
   "base-unix"
   "base-threads"
 ]
+x-commit-hash: "5472766b2448308a7160dfd0fca1ec711e124a5c"
 url {
-  src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz"
+  src: "https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz"
   checksum: [
-    "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15"
-    "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89"
+    "sha256=c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d"
+    "sha512=2b4b311824471dac8196181d7c7267f96b1b73f35341b72019f169cf6d42a19254e90bdfba2d3ecb138ad318e2e2431dd0ec6c38d9efe1da382ec95f5d9e959b"
   ]
 }
diff --git a/esy.lock/opam/fmt.0.8.8/opam b/esy.lock/opam/fmt.0.8.9/opam
similarity index 92%
rename from esy.lock/opam/fmt.0.8.8/opam
rename to esy.lock/opam/fmt.0.8.9/opam
index f493b5f5..6751a891 100644
--- a/esy.lock/opam/fmt.0.8.8/opam
+++ b/esy.lock/opam/fmt.0.8.9/opam
@@ -39,6 +39,6 @@ Fmt is distributed under the ISC license.
 [cmdliner]: http://erratique.ch/software/cmdliner
 """
 url {
-archive: "https://erratique.ch/software/fmt/releases/fmt-0.8.8.tbz"
-checksum: "473490fcfdf3ff0a8ccee226b873d4b2"
+archive: "https://erratique.ch/software/fmt/releases/fmt-0.8.9.tbz"
+checksum: "4001b51cde90ea4fd99a4a5033ecf411"
 }
diff --git a/esy.lock/opam/fpath.0.7.2/opam b/esy.lock/opam/fpath.0.7.2/opam
deleted file mode 100644
index 2613a6ac..00000000
--- a/esy.lock/opam/fpath.0.7.2/opam
+++ /dev/null
@@ -1,34 +0,0 @@
-opam-version: "2.0"
-maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
-authors: ["Daniel Bünzli <daniel.buenzl i@erratique.ch>"]
-homepage: "http://erratique.ch/software/fpath"
-doc: "http://erratique.ch/software/fpath/doc"
-dev-repo: "git+http://erratique.ch/repos/fpath.git"
-bug-reports: "https://github.com/dbuenzli/fpath/issues"
-tags: [ "file" "system" "path" "org:erratique" ]
-license: "ISC"
-depends: [
-  "ocaml" {>= "4.01.0"}
-  "ocamlfind" {build}
-  "ocamlbuild" {build}
-  "topkg" {build & >= "0.9.0"}
-  "result"
-  "astring"
-]
-build: [[
-  "ocaml" "pkg/pkg.ml" "build"
-          "--dev-pkg" "%{pinned}%" ]]
-synopsis: "File system paths for OCaml"
-description: """
-Fpath is an OCaml module for handling file system paths with POSIX or
-Windows conventions. Fpath processes paths without accessing the file
-system and is independent from any system library.
-
-Fpath depends on [Astring][astring] and is distributed under the ISC
-license.
-
-[astring]: http://erratique.ch/software/astring"""
-url {
-  src: "http://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz"
-  checksum: "md5=52c7ecb0bf180088336f3c645875fa41"
-}
diff --git a/esy.lock/opam/fpath.0.7.3/opam b/esy.lock/opam/fpath.0.7.3/opam
new file mode 100644
index 00000000..ae3336e4
--- /dev/null
+++ b/esy.lock/opam/fpath.0.7.3/opam
@@ -0,0 +1,36 @@
+opam-version: "2.0"
+maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
+authors: ["The fpath programmers"]
+homepage: "https://erratique.ch/software/fpath"
+doc: "https://erratique.ch/software/fpath/doc"
+dev-repo: "git+https://erratique.ch/repos/fpath.git"
+bug-reports: "https://github.com/dbuenzli/fpath/issues"
+tags: [ "file" "system" "path" "org:erratique" ]
+license: "ISC"
+depends: [
+   "ocaml" {>= "4.03.0"}
+   "ocamlfind" {build}
+   "ocamlbuild" {build}
+   "topkg" {build & >= "0.9.0"}
+   "astring"
+]
+build: [[
+  "ocaml" "pkg/pkg.ml" "build"
+          "--dev-pkg=true" {dev} ]]
+
+synopsis: """File system paths for OCaml"""
+description: """\
+
+Fpath is an OCaml module for handling file system paths with POSIX or
+Windows conventions. Fpath processes paths without accessing the file
+system and is independent from any system library.
+
+Fpath depends on [Astring][astring] and is distributed under the ISC
+license.
+
+[astring]: http://erratique.ch/software/astring
+"""
+url {
+archive: "https://erratique.ch/software/fpath/releases/fpath-0.7.3.tbz"
+checksum: "0740b530e8fed5b0adc5eee8463cfc2f"
+}
diff --git a/esy.lock/opam/merlin.3.3.9/opam b/esy.lock/opam/merlin.3.4.1/opam
similarity index 80%
rename from esy.lock/opam/merlin.3.3.9/opam
rename to esy.lock/opam/merlin.3.4.1/opam
index a4fab620..6427488a 100644
--- a/esy.lock/opam/merlin.3.3.9/opam
+++ b/esy.lock/opam/merlin.3.4.1/opam
@@ -7,15 +7,17 @@ dev-repo: "git+https://github.com/ocaml/merlin.git"
 build: [
   ["dune" "subst"] {pinned}
   ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" "1"] {with-test & os != "macos" & ocaml:version >= "4.03"}
+  ["dune" "runtest" "-p" name "-j" "1"] {with-test & ocaml:version >= "4.03"}
 ]
 depends: [
   "ocaml" {>= "4.02.3" & < "4.12"}
   "dune" {>= "1.8.0"}
-  "ocamlfind" {>= "1.5.2"}
+  "dot-merlin-reader" {= version}
   "yojson" {>= "1.6.0"}
   "mdx" {with-test & >= "1.3.0"}
   "conf-jq" {with-test}
+  "csexp" {>= "1.2.3"}
+  "result" {>= "1.5"}
 ]
 synopsis:
   "Editor helper, provides completion, typing and source browsing in Vim and Emacs"
@@ -61,11 +63,12 @@ See https://github.com/OCamlPro/opam-user-setup
 "
   {success & !user-setup:installed}
 ]
+x-commit-hash: "35dd6b466dce1f542de82e5c6df0bff94e394fe1"
 url {
   src:
-    "https://github.com/ocaml/merlin/releases/download/v3.3.9/merlin-v3.3.9.tbz"
+    "https://github.com/ocaml/merlin/releases/download/v3.4.1/merlin-v3.4.1.tbz"
   checksum: [
-    "sha256=a3170f1a993d810d552a21a4baa328dff0fe9ac9bf4b8aa6ba3f179a9240cf02"
-    "sha512=63034766c7dc7de21e3ce8624ed760a9d76b79cacbee8c17ecef2c62df00438ebd84f43a0d558cf8d9c4a800dac99e4b2f25c324f363a590cc294e46420f46aa"
+    "sha256=e7f28ca520d1ab4a58e8ba876b665b1ecf9917cee7e5b3e3330afbd1d12a9e2a"
+    "sha512=40ae93397aea031c1b4450998b448fc1df9671d612be0a02986688e5dd1390ced1c31bb2cdde9c6b52f8be841ca9fd1931fc302b26ef19cb2e88925d3b360c37"
   ]
 }
diff --git a/esy.lock/opam/topkg.1.0.2/opam b/esy.lock/opam/topkg.1.0.3/opam
similarity index 97%
rename from esy.lock/opam/topkg.1.0.2/opam
rename to esy.lock/opam/topkg.1.0.3/opam
index 292792eb..6e073a11 100644
--- a/esy.lock/opam/topkg.1.0.2/opam
+++ b/esy.lock/opam/topkg.1.0.3/opam
@@ -43,6 +43,6 @@ Topkg-care is distributed under the ISC license it depends on
 [webbrowser]: http://erratique.ch/software/webbrowser
 """
 url {
-archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.2.tbz"
-checksum: "b4925b2c37f73f8f0b79ea07ab15ff67"
+archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz"
+checksum: "e285f7a296d77ee7d831ba9a6bfb396f"
 }
diff --git a/esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json b/esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json
deleted file mode 100644
index affde1bc..00000000
--- a/esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "buildsInSource": true,
-  "build": [
-    [
-      "ocaml",
-      "configure.ml",
-      "--libdir",
-      "#{self.lib}"
-    ],
-    [
-      "env",
-      "-u",
-      "OCAMLLIB",
-      "ocaml",
-      "bootstrap.ml"
-    ],
-    [
-      "./dune.exe",
-      "build",
-      "-p",
-      "dune",
-      "--profile",
-      "dune-bootstrap"
-    ]
-  ],
-  "install": "esy-installer dune.install",
-  "buildEnv": {
-    "OCAMLFIND_CONF": "$OCAMLFIND_SECONDARY_PREFIX/lib/findlib.conf.d/ocaml-secondary-compiler.conf",
-    "OCAMLPATH": "#{ $OCAMLFIND_SECONDARY_PREFIX / 'lib' : ocaml.lib : $OCAML_SECONDARY_COMPILER_PREFIX / 'share' / 'ocaml-secondary-compiler' / 'lib' }"
-  }
-}
diff --git a/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh b/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh
new file mode 100644
index 00000000..b2a94f75
--- /dev/null
+++ b/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+SECONDARY_CONF="$OCAMLFIND_SECONDARY_PREFIX/lib/findlib.conf.d/ocaml-secondary-compiler.conf" 
+
+if test -f $SECONDARY_CONF; then
+   export OCAMLFIND_CONF=$SECONDARY_CONF;
+fi
+
+env -u OCAMLLIB ocaml bootstrap.ml
+./dune.exe build -p dune --profile dune-bootstrap
diff --git a/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json b/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json
new file mode 100644
index 00000000..c7d77ab6
--- /dev/null
+++ b/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json
@@ -0,0 +1,8 @@
+{
+  "buildsInSource": true,
+  "build": "bash build.sh",
+  "install": "esy-installer dune.install",
+  "buildEnv": {
+    "OCAMLPATH": "#{ $OCAMLFIND_SECONDARY_PREFIX / 'lib' : ocaml.lib : $OCAML_SECONDARY_COMPILER_PREFIX / 'share' / 'ocaml-secondary-compiler' / 'lib' }"
+  }
+}
diff --git a/lib/Common.re b/lib/Common.re
index dae1ce91..a263cb58 100644
--- a/lib/Common.re
+++ b/lib/Common.re
@@ -209,3 +209,4 @@ let toDuneStanzas = c => {
 
 let getPath = c => c.path;
 let getPesyModules = c => c.pesyModules;
+
diff --git a/lib/Common.rei b/lib/Common.rei
index 1ca41e9d..403b7d37 100644
--- a/lib/Common.rei
+++ b/lib/Common.rei
@@ -32,3 +32,4 @@ let create:
     /* pesy modules */ PesyModule.t
   ) =>
   t;
+
diff --git a/lib/Executable.re b/lib/Executable.re
index 44cf9315..04e37782 100644
--- a/lib/Executable.re
+++ b/lib/Executable.re
@@ -109,13 +109,14 @@ module Mode = {
     };
 };
 type t = {
+  static: option(bool),
   binKVs: list((string, string)),
   modes: option(Mode.t),
 };
-let create = (binKVs, modes) => {binKVs, modes};
+let create = (binKVs, static, modes) => {binKVs, static, modes};
 let toDuneStanza = (common: Common.t, e) => {
   /* let {name: pkgName, require, path} = common; */
-  let {binKVs, modes: modesP} = e;
+  let {binKVs, static, modes: modesP} = e;
   let (
     libraries,
     flags,
@@ -130,14 +131,85 @@ let toDuneStanza = (common: Common.t, e) => {
     pesyModulesAliasModuleGen,
   ) =
     Common.toDuneStanzas(common);
+
+  /* TODO: hacky!
+        ocamlopt flags are not lists. They are s-expresions.
+        Each item in the list can a single item or another list of items.
+        And so on..
+        TODO: remodel some of the fields correctly as s-expressions
+     */
+
+  let ocamloptFlags =
+    switch (static) {
+    | Some(static) when static =>
+      Sexplib.Sexp.(
+        switch (ocamloptFlags) {
+        | None =>
+          Some(
+            List([
+              Atom("ocamlopt_flags"),
+              List([Atom("-ccopt"), Atom("-static")]),
+            ])
+            |> Stanza.ofSexp,
+          )
+        | Some(flags) =>
+          switch (Stanza.toSexp(flags)) {
+          | List(l) =>
+            switch (l) {
+            | [Atom("ocamlopt_flags"), ...rest] =>
+              Some(
+                List([
+                  Atom("ocamlopt_flags"),
+                  ...(rest @ [List([Atom("-ccopt"), Atom("-static")])]),
+                ])
+                |> Stanza.ofSexp,
+              )
+            | [] =>
+              Some(
+                List([
+                  Atom("ocamlopt_flags"),
+                  List([Atom("-ccopt"), Atom("-static")]),
+                ])
+                |> Stanza.ofSexp,
+              )
+            | _ => failwith("Invalid s-exp obtained for ocamlopt_flags")
+            }
+          | _ =>
+            Some(
+              List([
+                Atom("ocamlopt_flags"),
+                List([Atom("-ccopt"), Atom("-static")]),
+              ])
+              |> Stanza.ofSexp,
+            )
+          }
+        }
+      )
+    | Some(_) => ocamloptFlags
+    | None => ocamloptFlags
+    };
+
   let path = Common.getPath(common);
-  let (mains, publicNames) = List.fold_right((tuple, acc) => {
-    let (main, publicName) = tuple;
-    let (mains, publicNames) = acc;
-    (mains @ [main], publicNames @ [publicName]);
-    }, binKVs,([], []));
-  let name = Stanza.createExpression([Stanza.createAtom("names"), ...(mains |> List.map(x => x|> moduleNameOf |> Stanza.createAtom))])
-  let public_name = Stanza.createExpression([Stanza.createAtom("public_names"), ...(publicNames  |> List.map(Stanza.createAtom))]);
+  let (mains, publicNames) =
+    List.fold_right(
+      (tuple, acc) => {
+        let (main, publicName) = tuple;
+        let (mains, publicNames) = acc;
+        (mains @ [main], publicNames @ [publicName]);
+      },
+      binKVs,
+      ([], []),
+    );
+  let name =
+    Stanza.createExpression([
+      Stanza.createAtom("names"),
+      ...mains |> List.map(x => x |> moduleNameOf |> Stanza.createAtom),
+    ]);
+  let public_name =
+    Stanza.createExpression([
+      Stanza.createAtom("public_names"),
+      ...publicNames |> List.map(Stanza.createAtom),
+    ]);
 
   let modules =
     Stanza.createExpression([
diff --git a/lib/Executable.rei b/lib/Executable.rei
index 0e1eb5f6..1b04822c 100644
--- a/lib/Executable.rei
+++ b/lib/Executable.rei
@@ -7,5 +7,5 @@ module Mode: {
   let ofFieldTypes: FieldTypes.t => t;
   let toStanzas: t => list(Stanza.t);
 };
-let create: (list((string, string)), option(Mode.t)) => t;
+let create: (list((string, string)), option(bool), option(Mode.t)) => t;
 let toDuneStanza: (Common.t, t) => (string, list(Stanza.t));
diff --git a/lib/Lib.re b/lib/Lib.re
index 84dce73c..28dad6f4 100644
--- a/lib/Lib.re
+++ b/lib/Lib.re
@@ -206,4 +206,4 @@ let duneEject = (projectPath, manifestFile, subpackageNameOrPath) => {
     );
     write(Path.(pesyPackage.pkg_path / "dune"), DuneFile.toString(duneFile));
   };
-};
\ No newline at end of file
+};
diff --git a/lib/PesyConf.re b/lib/PesyConf.re
index d674f159..b94ea67b 100644
--- a/lib/PesyConf.re
+++ b/lib/PesyConf.re
@@ -669,10 +669,11 @@ let toPesyConf = (projectPath, rootName, pkg, ~duneVersion) => {
       | JSON.NullJSONValue () => None
       | e => raise(e)
       };
+    let static = try(Some(JSON.member(conf, "static") |> JSON.toValue |> FieldTypes.toBool)) { | JSON.NullJSONValue () => None | e => raise(e) };
     {
       pkg_path,
       common,
-      pkgType: ExecutablePackage(Executable.create(binKVs, modes)),
+      pkgType: ExecutablePackage(Executable.create(binKVs, static, modes)),
     };
   | None =>
     let namespace =
diff --git a/unit-tests/runner/Lib.re b/unit-tests/runner/Lib.re
index d29ad8e0..afb4e225 100644
--- a/unit-tests/runner/Lib.re
+++ b/unit-tests/runner/Lib.re
@@ -875,4 +875,51 @@ describe("PesyConf.testToPackages", ({test, _}) => {
       "(library (name Foo) (public_name bar.lib) (modules (:standard))\n    (libraries foo) (c_names stub1 stub2))\n",
     ])
   );
-});
\ No newline at end of file
+  
+  test("Sample config - 32 - Static linking with empty ocamloptFlags", ({expect, _}) =>
+    expect.list(
+      testToPackages(
+        {|
+         {
+             "name": "foo",
+             "buildDirs": {
+             "testExe": {
+               "bin": "Foo.re",
+               "static": true
+             }
+           }
+         }
+       |},
+        ~duneVersion="1.11",
+      )
+      |> List.map(DuneFile.toString),
+    ).
+      toEqual([
+      "(executables (names Foo) (modules (:standard)) (public_names Foo.exe)\n    (ocamlopt_flags (-ccopt -static)))\n",
+    ])
+  );
+  
+  test("Sample config - 32 - Static linking with non-empty ocamloptFlags", ({expect, _}) =>
+    expect.list(
+      testToPackages(
+        {|
+         {
+             "name": "foo",
+             "buildDirs": {
+             "testExe": {
+               "bin": "Foo.re",
+               "static": true,
+               "ocamloptFlags": ["-verbose"]
+             }
+           }
+         }
+       |},
+        ~duneVersion="1.11",
+      )
+      |> List.map(DuneFile.toString),
+    ).
+      toEqual([
+      "(executables (names Foo) (modules (:standard)) (public_names Foo.exe)\n    (ocamlopt_flags -verbose (-ccopt -static)))\n",
+    ])
+  );
+});