diff --git a/bazel/bravo/bravo.txt b/bazel/bravo/bravo.txt
index e7f97dabaa76..c369ed2471b5 100644
--- a/bazel/bravo/bravo.txt
+++ b/bazel/bravo/bravo.txt
@@ -7279,7 +7279,6 @@ blanketmaking
 basest
 blastodisk
 bicuspidate
-biorhythmicities
 buffcoat
 bethorns
 befogs
@@ -15706,6 +15705,7 @@ broiled
 brichen
 backstone
 believingly
+biorhythmicities
 blare
 beshame
 birthdays
diff --git a/logical-conflict.txt b/logical-conflict.txt
new file mode 100644
index 000000000000..413acb3b1231
--- /dev/null
+++ b/logical-conflict.txt
@@ -0,0 +1 @@
+simulate logical merge conflict
\ No newline at end of file