diff --git a/rocketemu/spike_rs/src/spike_event.rs b/rocketemu/spike_rs/src/spike_event.rs
index b9cddbf6c0..5d62678223 100644
--- a/rocketemu/spike_rs/src/spike_event.rs
+++ b/rocketemu/spike_rs/src/spike_event.rs
@@ -100,10 +100,6 @@ pub struct SpikeEvent {
 }
 
 impl SpikeEvent {
-<<<<<<< HEAD
-  
-=======
->>>>>>> 9c6d4dfe (get info with pc)
   pub fn new_with_pc(pc: u64, do_log_vrf: bool) -> Self {
     SpikeEvent {
       do_log_vrf,