diff --git a/.clang-tidy b/.clang-tidy
index 0908ccb..4469b37 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -11,6 +11,7 @@ Checks: '
   performance-*,
   readability-*,
 
+<<<<<<< HEAD
   -bugprone-easily-swappable-parameters,
 
   -cppcoreguidelines-avoid-magic-numbers,
@@ -18,6 +19,10 @@ Checks: '
 
   -google-objc-function-naming,
   -google-readability-todo,
+||||||| e0a9d73
+=======
+  -cppcoreguidelines-avoid-magic-numbers,
+>>>>>>> f1af0a699020eeef4d24ac8186e577752169e2c6
   
   -misc-no-recursion,
   -modernize-use-nodiscard,