diff --git a/.github/workflows/merge_conflicts.yaml b/.github/workflows/merge_conflicts.yaml
new file mode 100644
index 00000000..ad878ca7
--- /dev/null
+++ b/.github/workflows/merge_conflicts.yaml
@@ -0,0 +1,18 @@
+name: Auto Comment Merge Conflicts
+
+on: push
+
+permissions:
+  pull-requests: write
+
+jobs:
+  auto-comment-merge-conflicts:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: codytseng/auto-comment-merge-conflicts@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          comment-body: "Hey there 👋🏼, your current PR has some merge conflicts. KIndly try to resolve them in your local fork and push the new changes."
+          wait-ms: 3000
+          max-retries: 5
+          ignore-authors: asyncapi-bot,dependabot[bot],dependabot-preview[bot],allcontributors
\ No newline at end of file