diff --git a/setup.env b/setup.env
index 57c6aa21..6418a522 100755
--- a/setup.env
+++ b/setup.env
@@ -39,3 +39,8 @@ $ONL/tools/submodules.py $ONL sm/bigcode
 
 # Export the current debian suite
 export ONL_DEBIAN_SUITE=$(lsb_release -c -s)
+
+# Enable local post-merge githook
+if [ ! -f $ONL/.git/hooks/post-merge ]; then
+    cp $ONL/tools/scripts/post-merge.hook $ONL/.git/hooks/post-merge
+fi
diff --git a/tools/scripts/post-merge.hook b/tools/scripts/post-merge.hook
new file mode 100755
index 00000000..e4bad577
--- /dev/null
+++ b/tools/scripts/post-merge.hook
@@ -0,0 +1,15 @@
+#!/bin/bash
+############################################################
+#
+# Every time a merge is performed we should invalidate
+# the module manifest.
+#
+############################################################
+mm="$GIT_DIR/../make/module-manifest.mk"
+
+if [ -f "$mm" ]; then
+    echo "Removing module manifest after merge..."
+    rm "$mm"
+fi
+
+