diff --git a/.gitmodules b/.gitmodules
index 6e8ef43..89ed412 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/let-def/merlin-extend
 [submodule "merlin"]
 	path = merlin
-	url = https://github.com/voodoos/merlin.git
+	url = https://github.com/ocaml/merlin.git
 [submodule "ocaml"]
 	path = ocaml
 	url = https://github.com/ocaml/ocaml.git
diff --git a/Makefile b/Makefile
index 735ae7d..dcc24ff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: init
 init:
-	opam switch create . 5.1.0 --no-install -y
+	opam switch create . 5.1.1 --no-install -y
 	opam install . --deps-only -y
 	opam install menhir.20210419 ocamlformat ocaml-lsp-server -y
 
diff --git a/dune-project b/dune-project
index 30eac3c..26034e2 100644
--- a/dune-project
+++ b/dune-project
@@ -28,5 +28,4 @@
  (name mlx))
 
 (package
- (name ocamlmerlin-mlx)
- )
+ (name ocamlmerlin-mlx))
diff --git a/merlin b/merlin
index e2eb329..7d7f525 160000
--- a/merlin
+++ b/merlin
@@ -1 +1 @@
-Subproject commit e2eb3291e58261f660c25f4d513a389439ad0c73
+Subproject commit 7d7f525180f5979516e10c05d0cd49823edb5ef1
diff --git a/test/example/dune b/test/example/dune
index 2e305b1..d72822f 100644
--- a/test/example/dune
+++ b/test/example/dune
@@ -1,4 +1,7 @@
 (executable
-  (name main))
+ (package mlx-example)
+ (public_name mlx-example)
+ (name main))
 
-(cram (deps ./main.exe))
+(cram
+ (deps ./main.exe))