diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
index f482d48118..2834abc7f0 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
@@ -160,7 +160,6 @@ abstract class AbstractToken implements TokenInterface
         }
 
         return $isCalledFromOverridingMethod ? $serialized : serialize($serialized);
->>>>>>> 4.4
     }
 
     /**