diff --git a/tb/tb_module_program_counter.v b/tb/tb_module_program_counter.v
index 7fafbbb..da10dbb 100644
--- a/tb/tb_module_program_counter.v
+++ b/tb/tb_module_program_counter.v
@@ -42,11 +42,14 @@ module tb_module_program_counter ();
         #10
         reset = 1'b0;
         `assert_no_wait("module_program_counter is_jmp: 0, is_branch: 0, alu_not: 0, alu_out: 0, imm: 0", addr, 0)
+<<<<<<< HEAD
         #2
         `assert_no_wait("module_program_counter is_jmp: 0, is_branch: 0, alu_not: 0, alu_out: 0, imm: 0", addr, 4)
         #2
         `assert_no_wait("module_program_counter is_jmp: 0, is_branch: 0, alu_not: 0, alu_out: 0, imm: 0", addr, 8)
 
+=======
+>>>>>>> d6f7fb498b1347201d1c08f9c368aff27a10a77f
 
         `end_message
     end