diff --git a/.clang-tidy b/.clang-tidy
index d141fd9f..5189c670 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,5 +1,5 @@
 ---
-Checks:          '*,-llvm-header-guard,-hicpp-*,-readability-function-size,-google-readability-todo,-readability-magic-numbers,-cppcoreguidelines-avoid-magic-numbers,-readability-isolate-declaration'
+Checks:          '*,-llvm-header-guard,-hicpp-*,-readability-function-size,-google-readability-todo,-readability-magic-numbers,-cppcoreguidelines-avoid-magic-numbers,-readability-isolate-declaration,-readability-uppercase-literal-suffix'
 WarningsAsErrors: '*'
 HeaderFilterRegex: '.*'
 AnalyzeTemporaryDtors: false
diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 00000000..d60d32b4
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,14 @@
+pull_request_rules:
+  - name: Automatic merge
+    conditions:
+      - base=master
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+      - status-success=Travis CI - Pull Request
+      - status-success=Travis CI - Branch
+      - status-success=continuous-integration/appveyor/branch
+      - status-success=continuous-integration/appveyor/pr
+      - status-success=build
+    actions:
+      merge:
+        strict: smart