Fix merge

Author: nicolas-grekas

Tests/DependencyInjection/SecurityExtensionTest.php

@@ -892,7 +892,6 @@ public function testCustomHasherWithMigrateFrom()
         $container = $this->getRawContainer();
 
         $container->loadFromExtension('security', [
-            'enable_authenticator_manager' => true,
             'password_hashers' => [
                 'legacy' => 'md5',
                 'App\User' => [