diff --git a/src/ConflictDiscovery/DefaultConflictDiscovery.php b/src/ConflictDiscovery/DefaultConflictDiscovery.php
index 526be5f..2a5f67c 100644
--- a/src/ConflictDiscovery/DefaultConflictDiscovery.php
+++ b/src/ConflictDiscovery/DefaultConflictDiscovery.php
@@ -5,8 +5,27 @@ namespace Drupal\conflict\ConflictDiscovery;
 use Drupal\conflict\ConflictTypes;
 use Drupal\conflict\Event\EntityConflictDiscoveryEvent;

+/**
+ *
+ */
 class DefaultConflictDiscovery extends ConflictDiscoveryBase {

+  /**
+   * {@inheritdoc}
+   */
+  private function isDefaultValue(FieldItemListInterface $field_items_local) {
+
+    // If local field has default value and remote has changed, apply automerge.
+    $local_value = $field_items_local->getValue();
+
+    // Check for field value is not set or default.
+    if (isset($local_value[0]) && (!array_key_exists('value', $local_value[0]) || $local_value[0]['value'] === NULL)) {
+      return TRUE;
+    }
+
+    return FALSE;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -44,10 +63,16 @@ class DefaultConflictDiscovery extends ConflictDiscoveryBase {

       // Check for changes between the local and the remote entity versions.
       if (!$field_items_local->equals($field_items_remote)) {
+
         // Check for changes between the remote and the base entity versions.
         if (!$field_items_remote->equals($field_items_base)) {
           // Check for changes between the local and the base entity versions.
           $conflict_type = $field_items_local->equals($field_items_base) ? ConflictTypes::CONFLICT_TYPE_REMOTE : ConflictTypes::CONFLICT_TYPE_LOCAL_REMOTE;
+
+          if ($this->isDefaultValue($field_items_local)) {
+            $conflict_type = ConflictTypes::CONFLICT_TYPE_REMOTE;
+          }
+
           $event->addConflict($field_name, $conflict_type);
         }
       }
diff --git a/src/Plugin/Conflict/FieldComparator/FieldComparatorDefault.php b/src/Plugin/Conflict/FieldComparator/FieldComparatorDefault.php
index 21cb2c3..94b7c90 100644
--- a/src/Plugin/Conflict/FieldComparator/FieldComparatorDefault.php
+++ b/src/Plugin/Conflict/FieldComparator/FieldComparatorDefault.php
@@ -29,6 +29,22 @@ class FieldComparatorDefault extends PluginBase implements FieldComparatorInterf
     return !$equals;
   }

+  /**
+   * {@inheritdoc}
+   */
+  private function isDefaultValue(FieldItemListInterface $field_items_local) {
+
+    // If local field has default value and remote has changed, apply automerge.
+    $local_value = $field_items_local->getValue();
+
+    // Check for field value is not set or default.
+    if (isset($local_value[0]) && (!array_key_exists('value', $local_value[0]) || $local_value[0]['value'] === NULL)) {
+      return TRUE;
+    }
+
+    return FALSE;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -42,6 +58,11 @@ class FieldComparatorDefault extends PluginBase implements FieldComparatorInterf
         // original version.
         $conflict_type = $this->hasChanged($local, $original, $langcode, $entity_type_id, $bundle, $field_type, $field_name)
           ? ConflictTypes::CONFLICT_TYPE_LOCAL_REMOTE : ConflictTypes::CONFLICT_TYPE_REMOTE;
+
+        if ($this->isDefaultValue($local)) {
+          $conflict_type = ConflictTypes::CONFLICT_TYPE_REMOTE;
+        }
+
         return $conflict_type;
       }
     }