diff --git a/bazel/delta/delta.txt b/bazel/delta/delta.txt
index 6b8cb93ef9e28..14526aff75bd7 100644
--- a/bazel/delta/delta.txt
+++ b/bazel/delta/delta.txt
@@ -11096,6 +11096,7 @@ dialogist
 depreciates
 discircumspection
 draying
+doubty
 disagreing
 demolish
 discontented
@@ -12788,7 +12789,6 @@ decorament
 dismayfully
 desistive
 deckie
-doubty
 determinatively
 diploes
 deponer
diff --git a/bazel/echo/echo.txt b/bazel/echo/echo.txt
index 40eddce082328..ea358acd1e607 100644
--- a/bazel/echo/echo.txt
+++ b/bazel/echo/echo.txt
@@ -8864,6 +8864,7 @@ ebon
 exopterygota
 equational
 eightvo
+enwrap
 estivate
 enouncing
 epigonos
@@ -12030,7 +12031,6 @@ eleoplast
 equimolal
 ephemerist
 eviternal
-enwrap
 ever
 extruct
 exurbias
diff --git a/logical-conflict.txt b/logical-conflict.txt
new file mode 100644
index 0000000000000..413acb3b12312
--- /dev/null
+++ b/logical-conflict.txt
@@ -0,0 +1 @@
+simulate logical merge conflict
\ No newline at end of file