diff --git a/src/JwksEndpoint.php b/src/JwksEndpoint.php
index b18f6fbe..92197f17 100644
--- a/src/JwksEndpoint.php
+++ b/src/JwksEndpoint.php
@@ -52,11 +52,7 @@ public function getPublicJwks()
     }
 
     /**
-<<<<<<< HEAD
      * @deprecated
-=======
-     * @todo: Deprecate this in the next major version
->>>>>>> mgmt-132-migrations
      */
     public function outputJwks()
     {