fix merge

Author: nicolas-grekas

src/Symfony/Component/HttpKernel/Kernel.php

@@ -678,10 +678,6 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
             'file' => $cache->getPath(),
             'as_files' => true,
             'debug' => $this->debug,
-<<<<<<< HEAD
-=======
-            'inline_class_loader_parameter' => \PHP_VERSION_ID >= 70000 && !$this->loadClassCache && !class_exists(ClassCollectionLoader::class, false) ? 'container.dumper.inline_class_loader' : null,
->>>>>>> 3.4
         ));
 
         $rootCode = array_pop($content);

src/Symfony/Component/Yaml/Parser.php

@@ -310,6 +310,8 @@ private function doParse(string $value, int $flags)
                             throw new ParseException(sprintf('Duplicate key "%s" detected.', $key), $this->getRealCurrentLineNb() + 1, $this->currentLine);
                         }
                     } else {
+                        // remember the parsed line number here in case we need it to provide some contexts in error messages below
+                        $realCurrentLineNbKey = $this->getRealCurrentLineNb();
                         $value = $this->parseBlock($this->getRealCurrentLineNb() + 1, $this->getNextEmbedBlock(), $flags);
                         if ('<<' === $key) {
                             $this->refs[$refMatches['ref']] = $value;