fix: use logical OR instead of bitwise OR in conflict resolver (#6492)

Author: dentiny

rust/lance/src/io/commit/conflict_resolver.rs

@@ -1095,7 +1095,7 @@ impl<'a> TransactionRebase<'a> {
                         .transaction
                         .operation
                         .upsert_key_conflict(&other_transaction.operation)
-                        | self
+                        || self
                             .transaction
                             .operation
                             .modifies_same_metadata(&other_transaction.operation)