diff --git a/lang/semgrep-grammars/src/semgrep-ocaml/grammar.js b/lang/semgrep-grammars/src/semgrep-ocaml/grammar.js
index d801f472..07ec4122 100644
--- a/lang/semgrep-grammars/src/semgrep-ocaml/grammar.js
+++ b/lang/semgrep-grammars/src/semgrep-ocaml/grammar.js
@@ -12,8 +12,11 @@ module.exports = grammar(base_grammar, {
   conflicts: ($, previous) => previous.concat([
     // those conflicts are because of the $._signature in compilation_unit
     [$._structure_item, $._signature_item],
+    [$._structure_item_ext, $._signature_item_ext],
     [$._structure, $._signature],
-    [$._module_type, $._simple_module_expression],
+    [$.include_module, $.include_module_type],
+    [$.parenthesized_module_type, $.parenthesized_module_expression],
+    [$.functor_type, $.functor],
   ]),
 
   /*
diff --git a/lang/semgrep-grammars/src/tree-sitter-ocaml b/lang/semgrep-grammars/src/tree-sitter-ocaml
index 4abfdc1c..4a885a61 160000
--- a/lang/semgrep-grammars/src/tree-sitter-ocaml
+++ b/lang/semgrep-grammars/src/tree-sitter-ocaml
@@ -1 +1 @@
-Subproject commit 4abfdc1c7af2c6c77a370aee974627be1c285b3b
+Subproject commit 4a885a615634dd447ae6b9d8f2cee4a3ea495087