diff --git a/styles/Datadog/merge_conflict.yml b/styles/Datadog/merge_conflict.yml
new file mode 100644
index 0000000..62604cd
--- /dev/null
+++ b/styles/Datadog/merge_conflict.yml
@@ -0,0 +1,7 @@
+extends: existence
+message: "It looks like you have a merge conflict! Fix the conflict and try again."
+link: "https://github.com/DataDog/documentation/blob/master/CONTRIBUTING.md#dashes"
+nonword: true
+level: error
+tokens:
+  - '^[<|=|>]{7}( .+)?$'