diff --git a/tests/Unit/File/X509/X509Test.php b/tests/Unit/File/X509/X509Test.php
index 5594e7a5..df46f277 100644
--- a/tests/Unit/File/X509/X509Test.php
+++ b/tests/Unit/File/X509/X509Test.php
@@ -1183,7 +1183,6 @@ qzFkAKWjJj4KjfrbZX4C0Spfxw==
     }
 
     /**
-<<<<<<< HEAD
      * @group github1586
      */
     public function testComputeKeyIdentifier()