fix merge conflicts

Author: avalonche

crates/op-rbuilder/src/main.rs

@@ -45,7 +45,8 @@ fn main() {
                 )))
                 .with_add_ons(
                     OpAddOnsBuilder::default()
-                        .with_sequencer(rollup_args.sequencer.clone())
+                        // .with_sequencer(rollup_args.sequencer.clone())
+                        .with_sequencer(rollup_args.sequencer_http.clone())
                         .with_enable_tx_conditional(rollup_args.enable_tx_conditional)
                         .build(),
                 )