fix merge

Author: nicolas-grekas

src/Symfony/Component/HttpKernel/Kernel.php

@@ -657,7 +657,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
             'file' => $cache->getPath(),
             'as_files' => true,
             'debug' => $this->debug,
-            'hot_path_tag' => !$this->loadClassCache ? 'container.hot_path' : null,
+            'hot_path_tag' => 'container.hot_path',
         ));
 
         $rootCode = array_pop($content);