diff --git a/vault/identity_store_entities.go b/vault/identity_store_entities.go
index dc9d1c426b..baf97f39cd 100644
--- a/vault/identity_store_entities.go
+++ b/vault/identity_store_entities.go
@@ -485,7 +485,6 @@ func (i *IdentityStore) mergeEntity(txn *memdb.Txn, toEntity *identity.Entity, f
 		return errors.New("entity id to merge to is invalid"), nil
 	}
 
-	var conflictErrors error
 	for _, fromEntityID := range fromEntityIDs {
 		if fromEntityID == toEntity.ID {
 			return errors.New("to_entity_id should not be present in from_entity_ids"), nil
@@ -542,10 +541,6 @@ func (i *IdentityStore) mergeEntity(txn *memdb.Txn, toEntity *identity.Entity, f
 		}
 	}
 
-	if conflictErrors != nil && !force {
-		return conflictErrors, nil
-	}
-
 	// Update MemDB with changes to the entity we are merging to
 	err := i.MemDBUpsertEntityInTxn(txn, toEntity)
 	if err != nil {