diff --git a/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php b/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
index c44b159..e9fe802 100644
--- a/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
+++ b/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
@@ -48,22 +48,26 @@ public function build($class_name) {
       $output .= ' implements ' . implode(', ', $interfaces);
     }
 
-    $output .= <<<EOS
+    $properties = <<<'EOS'
  {
 
 /**
  * @var string
  */
-protected \$serviceId;
+protected $serviceId;
 
 /**
- * @var \\$class_name
+ * @var \{{ class_name }}
  */
-protected \$service;
+protected $service;
 
 
 EOS;
 
+    $properties = str_replace('{{ class_name }}', $class_name, $properties);
+
+    $output .= $properties;
+
     // Add all the methods.
     $methods = [];
     $methods[] = $this->buildConstructorMethod();
diff --git a/core/modules/system/src/Controller/DbUpdateController.php b/core/modules/system/src/Controller/DbUpdateController.php
index d61ab93..c3c25fa 100644
--- a/core/modules/system/src/Controller/DbUpdateController.php
+++ b/core/modules/system/src/Controller/DbUpdateController.php
@@ -69,6 +69,7 @@ class DbUpdateController extends ControllerBase {
   protected $entityDefinitionUpdateManager;
 
   /**
+<<<<<<< ours
    * The bare HTML page renderer.
    *
    * @var \Drupal\Core\Render\BareHtmlPageRendererInterface