diff --git a/bazel/delta/delta.txt b/bazel/delta/delta.txt
index e034b3d29df08..5b3ce77a35643 100644
--- a/bazel/delta/delta.txt
+++ b/bazel/delta/delta.txt
@@ -7570,6 +7570,7 @@ dobson
 dementie
 disembargoing
 devoto
+defervesce
 deturpate
 defect
 danziger
@@ -8554,7 +8555,6 @@ deforcer
 denudement
 daimons
 digestant
-defervesce
 drossy
 disseminates
 debauchedness
diff --git a/bazel/echo/echo.txt b/bazel/echo/echo.txt
index 4bc34da5b3418..f36d880ec1fbb 100644
--- a/bazel/echo/echo.txt
+++ b/bazel/echo/echo.txt
@@ -337,7 +337,6 @@ epenthetic
 emydian
 euphonized
 equably
-enbibe
 epedaphic
 eschars
 engulfs
@@ -1754,6 +1753,7 @@ epithelioceptor
 euskara
 eulogizes
 eruc
+enbibe
 elephants
 eldress
 exterminist
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