state: fix missed diff marker after rebase

crates/state/src/consensus.rs

@@ -16,11 +16,7 @@ use crate::{block::L2BlockId, l1::L1BlockId};
 /// This is updated when we see a consensus-relevant message.  This is L2 blocks
 /// but also L1 blocks being published with interesting things in them, and
 /// various other events.
-<<<<<<< HEAD
-#[derive(Clone, Debug, PartialEq, Eq, BorshSerialize, BorshDeserialize, Arbitrary)]
-=======
-#[derive(Clone, Debug, BorshDeserialize, BorshSerialize)]
->>>>>>> b70fef1 (state: tweak to consensus state, added Borsh serde derives)
+#[derive(Clone, Debug, Eq, PartialEq, BorshSerialize, BorshDeserialize, Arbitrary)]
 pub struct ConsensusState {
     /// Important consensus state.
     pub(super) chain_state: ConsensusChainState,