diff --git a/src/Extension/SandboxExtension.php b/src/Extension/SandboxExtension.php
index 4a877c0be..c942682d1 100644
--- a/src/Extension/SandboxExtension.php
+++ b/src/Extension/SandboxExtension.php
@@ -82,11 +82,7 @@ final class SandboxExtension extends AbstractExtension
         return $this->policy;
     }
 
-<<<<<<< HEAD
-    public function checkSecurity($tags, $filters, $functions): void
-=======
-    public function checkSecurity($tags, $filters, $functions, Source $source = null)
->>>>>>> 2.x
+    public function checkSecurity($tags, $filters, $functions, Source $source = null): void
     {
         if ($this->isSandboxed($source)) {
             $this->policy->checkSecurity($tags, $filters, $functions);