diff --git a/core/core.services.yml b/core/core.services.yml
index c75dff7..8604b86 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -709,7 +709,6 @@ services:
   bare_html_page_renderer:
     class: Drupal\Core\Render\BareHtmlPageRenderer
     arguments: ['@renderer']
-    lazy: true
   private_key:
     class: Drupal\Core\PrivateKey
     arguments: ['@state']
diff --git a/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php b/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
index 9abf2ab..c44b159 100644
--- a/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
+++ b/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
@@ -101,14 +101,14 @@ public function build($class_name) {
    * @return string
    */
   protected function buildLazyLoadItselfMethod() {
-    $output = <<<EOS
+    $output = <<<'EOS'
 protected function lazyLoadItself() {
-  if (!isset(\$this->service)) {
-    \$method_name = 'get' . Container::camelize(\$this->serviceId) . 'Service';
-    \$this->service = \\Drupal::getContainer()->\$method_name(FALSE);
+  if (!isset($this->service)) {
+    $method_name = 'get' . Container::camelize($this->serviceId) . 'Service';
+    $this->service = \Drupal::getContainer()->$method_name(FALSE);
   }
 
-  return \$this->service;
+  return $this->service;
 }
 
 EOS;
@@ -212,9 +212,9 @@ protected function buildMethodBody(\ReflectionMethod $reflection_method) {
    * @return string
    */
   protected function buildConstructorMethod() {
-    $output = <<<EOS
-public function __construct(\$service_id) {
-  \$this->serviceId = \$service_id;
+    $output = <<<'EOS'
+public function __construct($service_id) {
+  $this->serviceId = $service_id;
 }
 
 EOS;
diff --git a/core/modules/system/src/Controller/DbUpdateController.php b/core/modules/system/src/Controller/DbUpdateController.php
index c3c25fa..d61ab93 100644
--- a/core/modules/system/src/Controller/DbUpdateController.php
+++ b/core/modules/system/src/Controller/DbUpdateController.php
@@ -69,7 +69,6 @@ class DbUpdateController extends ControllerBase {
   protected $entityDefinitionUpdateManager;
 
   /**
-<<<<<<< ours
    * The bare HTML page renderer.
    *
    * @var \Drupal\Core\Render\BareHtmlPageRendererInterface