diff --git a/wally-pipelined/config/rv32ic/wally-config.vh b/wally-pipelined/config/rv32ic/wally-config.vh
index e835136f..17daa572 100644
--- a/wally-pipelined/config/rv32ic/wally-config.vh
+++ b/wally-pipelined/config/rv32ic/wally-config.vh
@@ -68,13 +68,8 @@
 
 `define BOOTTIMBASE   32'h00000000
 `define BOOTTIMRANGE  32'h00003FFF
-<<<<<<< HEAD
-`define TIMBASE    32'h80000000
-`define TIMRANGE   32'h0FFFFFFF
-=======
 `define TIMBASE       32'h80000000
 `define TIMRANGE      32'h07FFFFFF
->>>>>>> 8ba2d3f3f5386454804de1a4036360b1c2c32bc0
 `define CLINTBASE  32'h02000000
 `define CLINTRANGE 32'h0000FFFF
 `define GPIOBASE   32'h10012000
diff --git a/wally-pipelined/config/rv64ic/wally-config.vh b/wally-pipelined/config/rv64ic/wally-config.vh
index 6bcd9273..2e0d92fb 100644
--- a/wally-pipelined/config/rv64ic/wally-config.vh
+++ b/wally-pipelined/config/rv64ic/wally-config.vh
@@ -72,13 +72,8 @@
 
 `define BOOTTIMBASE   32'h00000000
 `define BOOTTIMRANGE  32'h00003FFF
-<<<<<<< HEAD
-`define TIMBASE    32'h80000000
-`define TIMRANGE   32'h0FFFFFFF
-=======
 `define TIMBASE       32'h80000000
 `define TIMRANGE      32'h07FFFFFF
->>>>>>> 8ba2d3f3f5386454804de1a4036360b1c2c32bc0
 `define CLINTBASE  32'h02000000
 `define CLINTRANGE 32'h0000FFFF
 `define GPIOBASE   32'h10012000
diff --git a/wally-pipelined/testbench/testbench-imperas.sv b/wally-pipelined/testbench/testbench-imperas.sv
index c17d6e2d..e2561db7 100644
--- a/wally-pipelined/testbench/testbench-imperas.sv
+++ b/wally-pipelined/testbench/testbench-imperas.sv
@@ -38,13 +38,8 @@ module testbench();
   parameter SIGNATURESIZE = 5000000;
 
   int test, i, errors, totalerrors;
-<<<<<<< HEAD
-  logic [31:0] sig32[0:SIGNATURESIZE];
-  logic [`XLEN-1:0] signature[0:SIGNATURESIZE];
-=======
   logic [31:0] sig32[0:MAXSIGLEN];
   logic [`XLEN-1:0] signature[0:MAXSIGLEN];
->>>>>>> 8ba2d3f3f5386454804de1a4036360b1c2c32bc0
   logic [`XLEN-1:0] testadr;
   string InstrFName, InstrDName, InstrEName, InstrMName, InstrWName;
   logic [31:0] InstrW;