diff --git a/.clang-format b/.clang-format
index 874e43d..b1cb972 100644
--- a/.clang-format
+++ b/.clang-format
@@ -7,8 +7,11 @@ ColumnLimit: 100
 Language: Cpp
 
 AllowShortFunctionsOnASingleLine: Inline
+AllowShortBlocksOnASingleLine: Empty
 
 IndentCaseLabels: false
 
 DerivePointerAlignment: false
-PointerAlignment: Left
\ No newline at end of file
+PointerAlignment: Left
+
+SeparateDefinitionBlocks: Always
diff --git a/.clang-tidy b/.clang-tidy
index 4469b37..0908ccb 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -11,7 +11,6 @@ Checks: '
   performance-*,
   readability-*,
 
-<<<<<<< HEAD
   -bugprone-easily-swappable-parameters,
 
   -cppcoreguidelines-avoid-magic-numbers,
@@ -19,10 +18,6 @@ Checks: '
 
   -google-objc-function-naming,
   -google-readability-todo,
-||||||| e0a9d73
-=======
-  -cppcoreguidelines-avoid-magic-numbers,
->>>>>>> f1af0a699020eeef4d24ac8186e577752169e2c6
   
   -misc-no-recursion,
   -modernize-use-nodiscard,