diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index 95bb9f1..13b6497 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -1245,22 +1245,14 @@ function book_node_type_update(NodeType $type) {
     $config = config('book.settings');
     // Update the list of node types that are allowed to be added to books.
     $allowed_types = $config->get('allowed_types');
-<<<<<<< HEAD
-    $old_key = array_search($type->old_type, $allowed_types);
-    if ($old_key !== FALSE) {
-      // Replace the old machine-readable name with the new machine-readable
-      // name.
-      $allowed_types[$old_key] = $type->type;
-      // Ensure that the allowed_types array is sorted consistently.
-      // @see book_admin_settings_submit()
-      sort($allowed_types);
-=======
     $key = array_search($type->original->id(), $allowed_types);
 
     if ($key !== FALSE) {
       $allowed_types[$type->id()] = $allowed_types[$key] ? $type->id() : 0;
       unset($allowed_types[$key]);
->>>>>>> applied patch
+      // Ensure that the allowed_types array is sorted consistently.
+      // @see book_admin_settings_submit()
+      sort($allowed_types);
       $config->set('allowed_types', $allowed_types);
     }
 
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index f6cd8a2..d980c85 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -255,9 +255,6 @@ function node_entity_display_alter(EntityDisplay $display, $context) {
 /**
  * Entity URI callback.
  *
-<<<<<<< HEAD
- * @param \Drupal\Core\Entity\EntityInterface $node
-=======
  * @param \Drupal\node\Plugin\Core\Entity\NodeType $type
  *   A node type entity.
  *
@@ -273,8 +270,7 @@ function node_type_uri(NodeType $type) {
 /**
  * Entity URI callback.
  *
- * @param Drupal\node\Node $node
->>>>>>> applied patch
+ * @param \Drupal\Core\Entity\EntityInterface $node
  *   A node entity.
  *
  * @return array
@@ -588,108 +584,6 @@ function node_type_update_nodes($old_id, $new_id) {
 }
 
 /**
-<<<<<<< HEAD
- * Builds and returns the list of available node types.
- *
- * The list of types is built by invoking hook_node_info() on all modules and
- * comparing this information with the node types in the {node_type} table.
- * These two information sources are not synchronized during module installation
- * until node_types_rebuild() is called.
- *
- * @param $rebuild
- *  (optional) TRUE to rebuild node types. Equivalent to calling
- *  node_types_rebuild(). Defaults to FALSE.
- *
- * @return
- *   An object with two properties:
- *   - names: Associative array of the names of node types, keyed by the type.
- *   - types: Associative array of node type objects, keyed by the type.
- *   Both of these arrays will include new types that have been defined by
- *   hook_node_info() implementations but not yet saved in the {node_type}
- *   table. These are indicated in the type object by $type->is_new being set
- *   to the value 1. These arrays will also include obsolete types: types that
- *   were previously defined by modules that have now been disabled, or for
- *   whatever reason are no longer being defined in hook_node_info()
- *   implementations, but are still in the database. These are indicated in the
- *   type object by $type->disabled being set to TRUE.
- */
-function _node_types_build($rebuild = FALSE) {
-  $cid = 'node_types:' . language(LANGUAGE_TYPE_INTERFACE)->langcode;
-
-  if (!$rebuild) {
-    $_node_types = &drupal_static(__FUNCTION__);
-    if (isset($_node_types)) {
-      return $_node_types;
-    }
-    if ($cache = cache()->get($cid)) {
-      $_node_types = $cache->data;
-      return $_node_types;
-    }
-  }
-
-  $_node_types = (object) array('types' => array(), 'names' => array());
-
-  foreach (module_implements('node_info') as $module) {
-    $info_array = module_invoke($module, 'node_info');
-    foreach ($info_array as $type => $info) {
-      $info['type'] = $type;
-      $_node_types->types[$type] = node_type_set_defaults($info);
-      $_node_types->types[$type]->module = $module;
-      $_node_types->names[$type] = $info['name'];
-    }
-  }
-  $query = db_select('node_type', 'nt')
-    ->addTag('node_type_access')
-    ->fields('nt')
-    ->orderBy('nt.type', 'ASC');
-  if (!$rebuild) {
-    $query->condition('disabled', 0);
-  }
-  foreach ($query->execute() as $type_object) {
-    $type_db = $type_object->type;
-    // Original disabled value.
-    $disabled = $type_object->disabled;
-    // Check for node types from disabled modules and mark their types for removal.
-    // Types defined by the node module in the database (rather than by a separate
-    // module using hook_node_info) have a base value of 'node_content'. The isset()
-    // check prevents errors on old (pre-Drupal 7) databases.
-    if (isset($type_object->base) && $type_object->base != 'node_content' && empty($_node_types->types[$type_db])) {
-      $type_object->disabled = TRUE;
-    }
-    if (isset($_node_types->types[$type_db])) {
-      $type_object->disabled = FALSE;
-    }
-    if (!isset($_node_types->types[$type_db]) || $type_object->modified) {
-      $_node_types->types[$type_db] = $type_object;
-      $_node_types->names[$type_db] = $type_object->name;
-
-      if ($type_db != $type_object->orig_type) {
-        unset($_node_types->types[$type_object->orig_type]);
-        unset($_node_types->names[$type_object->orig_type]);
-      }
-    }
-    $_node_types->types[$type_db]->disabled = $type_object->disabled;
-    $_node_types->types[$type_db]->disabled_changed = $disabled != $type_object->disabled;
-  }
-
-  if ($rebuild) {
-    foreach ($_node_types->types as $type => $type_object) {
-      if (!empty($type_object->is_new) || !empty($type_object->disabled_changed)) {
-        node_type_save($type_object);
-      }
-    }
-  }
-
-  asort($_node_types->names);
-
-  cache()->set($cid, $_node_types, CacheBackendInterface::CACHE_PERMANENT, array('node_types' => TRUE));
-
-  return $_node_types;
-}
-
-/**
-=======
->>>>>>> applied patch
  * Clears the node type cache.
  */
 function node_type_cache_reset() {
diff --git a/core/modules/poll/config/node.type.poll.yml b/core/modules/poll/config/node.type.poll.yml
deleted file mode 100644
index 6947662..0000000
--- a/core/modules/poll/config/node.type.poll.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-type: poll
-name: Poll
-base: poll
-module: poll
-locked: '1'
-description: 'A <em>poll</em> is a question with a set of possible responses. A <em>poll</em>, once created, automatically provides a simple running count of the number of votes received for each response.'
-help: ''
-has_title: '1'
-title_label: Question
-create_body: FALSE
-settings:
-  node:
-    # Not promoted to front page.
-    options:
-      - status
-langcode: und