Resolve merge conflicts

consensus/state_processing/src/per_block_processing.rs

@@ -626,7 +626,12 @@ pub fn get_expected_withdrawals<E: EthSpec>(
             .safe_rem(state.validators().len() as u64)?;
     }
 
-    Ok((withdrawals.into(), processed_partial_withdrawals_count))
+    Ok((
+        withdrawals
+            .try_into()
+            .map_err(BlockProcessingError::SszTypesError)?,
+        processed_partial_withdrawals_count,
+    ))
 }
 
 /// Apply withdrawals to the state.