diff --git a/bazel/charlie/charlie.txt b/bazel/charlie/charlie.txt
index e19f6a17ae4a0..e2c8c6b7b6623 100644
--- a/bazel/charlie/charlie.txt
+++ b/bazel/charlie/charlie.txt
@@ -12266,6 +12266,7 @@ centauromachia
 coccochromatic
 calcified
 circumradiuses
+confronting
 carbamyls
 conscripting
 costards
@@ -29499,7 +29500,6 @@ ceratothecae
 cantharis
 civilizade
 crystallin
-confronting
 crystallisability
 correctedness
 creatines
diff --git a/bazel/echo/echo.txt b/bazel/echo/echo.txt
index c142037e32c6a..7aa848582dba3 100644
--- a/bazel/echo/echo.txt
+++ b/bazel/echo/echo.txt
@@ -4360,7 +4360,6 @@ exilement
 excusability
 electropyrometer
 excessiveness
-epanody
 euglenas
 evaporating
 enomoty
@@ -5795,6 +5794,7 @@ excl
 enormous
 esiphonal
 entertainer
+epanody
 exenterating
 eparchean
 ephemeris
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