diff --git a/.gitignore b/.gitignore
index 1b4638a24..f1484e4f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,6 +160,7 @@ infer/src/.project
 /infer/src/istd/jbuild
 /infer/src/scripts/jbuild
 /infer/src/jbuild-workspace
+.merlin
 
 # generated when looking for dead code
 /infer/src/deadcode/.depend
diff --git a/infer/src/.merlin b/infer/src/.merlin
deleted file mode 100644
index 2e2a0a7bc..000000000
--- a/infer/src/.merlin
+++ /dev/null
@@ -1,94 +0,0 @@
-B _build/default/.InferModules.objs
-B _build/default/.infer.eobjs
-B _build/default/.infertop.eobjs
-B _build/default/atd/.InferGenerated.objs
-B _build/default/base/.InferBase.objs
-B _build/default/IR/.InferIR.objs
-B _build/default/istd/.InferStdlib.objs
-FLG -principal -safe-string -short-paths -strict-formats -strict-sequence
-FLG -w +a-4-9-40-41-42-44-45-48-60
-FLG -open Core -open InferStdlib -open InferGenerated -open InferModules -open IStd -open InferBase -open InferIR
-PKG ANSITerminal
-PKG atd
-PKG atdgen
-PKG base
-PKG base.caml
-PKG base.shadow_stdlib
-PKG base64
-PKG bigarray
-PKG bin_prot
-PKG bin_prot.shape
-PKG biniou
-PKG bytes
-PKG camlzip
-PKG camomile
-PKG cmdliner
-PKG compiler-libs
-PKG compiler-libs.bytecomp
-PKG compiler-libs.common
-PKG compiler-libs.toplevel
-PKG core
-PKG core_kernel
-PKG core_kernel.base_for_tests
-PKG easy-format
-PKG extlib
-PKG fieldslib
-PKG findlib.internal
-PKG findlib.top
-PKG jane-street-headers
-PKG javalib
-PKG lambda-term
-PKG llair
-PKG lwt
-PKG lwt.log
-PKG lwt.react
-PKG lwt.unix
-PKG mtime
-PKG mtime.clock.os
-PKG num
-PKG num.core
-PKG oUnit
-PKG oUnit.advanced
-PKG parmap
-PKG ppx_compare
-PKG ptrees
-PKG react
-PKG result
-PKG sawja
-PKG sexplib
-PKG sexplib.0
-PKG sexplib.unix
-PKG spawn
-PKG sqlite3
-PKG stdio
-PKG str
-PKG threads
-PKG threads.posix
-PKG typerep
-PKG unix
-PKG utop
-PKG variantslib
-PKG xmlm
-PKG yojson
-PKG zed
-PKG zip
-S .
-S IR
-S absint
-S atd
-S backend
-S base
-S bufferoverrun
-S checkers
-S clang
-S concurrency
-S eradicate
-S facebook
-S integration
-S istd
-S java
-S labs
-S python
-S quandary
-S unit
-S unit/clang
diff --git a/infer/src/atd/.merlin b/infer/src/atd/.merlin
deleted file mode 100644
index a3beae63b..000000000
--- a/infer/src/atd/.merlin
+++ /dev/null
@@ -1,12 +0,0 @@
-B ../_build/default/atd/.InferGenerated.objs
-FLG -open InferGenerated -g -short-paths -safe-string -principal -strict-formats -strict-sequence -bin-annot -w +3+5+6+8+10+11+12+18+19+20+21+23+26+29+27+32+33+34+35+37+38+39+50+52+57-4-9-40-41-42-45-48 -w -27-32-34-35-39
-PKG atd
-PKG atdgen
-PKG biniou
-PKG core
-PKG easy-format
-PKG ppx_compare
-PKG str
-PKG unix
-PKG yojson
-S .
diff --git a/infer/src/jbuild-workspace.in b/infer/src/jbuild-workspace.in
index 0487fb87d..5d93cb1be 100644
--- a/infer/src/jbuild-workspace.in
+++ b/infer/src/jbuild-workspace.in
@@ -1,7 +1,3 @@
-;; The .merlin generated by jbuilder gets confused about the ppx
-;; used, so for now rely on our own .merlin file.
-;; https://github.com/ocaml/dune/issues/657
-
-(context ((switch @OPAMSWITCH@) (name default)))
+(context ((switch @OPAMSWITCH@) (name default) (merlin)))
 (context ((switch @OPAMSWITCH@) (name opt)))
 (context ((switch @OPAMSWITCH@) (name test)))
diff --git a/infer/src/scripts/.merlin b/infer/src/scripts/.merlin
deleted file mode 100644
index 66ad25f01..000000000
--- a/infer/src/scripts/.merlin
+++ /dev/null
@@ -1,6 +0,0 @@
-B ../_build/default/scripts
-PKG core
-PKG str
-FLG -principal -safe-string -short-paths -strict-formats -strict-sequence
-FLG -w +a-4-9-40-41-42-44-45-48-60
-S .