diff --git a/.php_cs b/.php_cs
index 1c4e7d56..4ca9a7f8 100644
--- a/.php_cs
+++ b/.php_cs
@@ -10,6 +10,7 @@ $finder = Symfony\Component\Finder\Finder::create()
     ])
     ->name('*.php')
     ->notName('*.blade.php')
+    ->notName('GitConflictController.php')
     ->ignoreDotFiles(true)
     ->ignoreVCS(true);