From 7925fe31311372e6865d2a7816378a1bce747fef Mon Sep 17 00:00:00 2001
From: ethan-falicov <efalicov@hmc.edu>
Date: Wed, 10 Feb 2021 10:03:30 -0500
Subject: [PATCH] Fixed merge conflict stuff

---
 wally-pipelined/testbench/testbench-imperas.sv | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/wally-pipelined/testbench/testbench-imperas.sv b/wally-pipelined/testbench/testbench-imperas.sv
index ca97bef57..d71884b8f 100644
--- a/wally-pipelined/testbench/testbench-imperas.sv
+++ b/wally-pipelined/testbench/testbench-imperas.sv
@@ -145,7 +145,7 @@ string tests64iNOc[] = {
                      "rv64i/WALLY-SLTIU", "3000",
                      "rv64i/WALLY-SLLI", "3000",
                      "rv64i/WALLY-SRLI", "3000",
-                     "rv64i/WALLY-SRAI", "3000"
+                     "rv64i/WALLY-SRAI", "3000",
                      "rv64i/WALLY-LOAD", "11bf0",
                      "rv64i/WALLY-JAL", "4000",
                      "rv64i/WALLY-STORE", "3000",
@@ -242,14 +242,13 @@ string tests32i[] = {
                      "rv32i/WALLY-SLTIU", "2000",
                      "rv32i/WALLY-SLLI", "2000",
                      "rv32i/WALLY-SRLI", "2000",
-                     "rv32i/WALLY-SRAI", "2000"
+                     "rv32i/WALLY-SRAI", "2000",
                      "rv32i/WALLY-LOAD", "11c00",
                      "rv32i/WALLY-SUB", "3000",
                      "rv32i/WALLY-STORE", "2000",
                      "rv32i/WALLY-JAL", "3000"
 };
   string tests[];
-
   logic [`AHBW-1:0] HRDATAEXT;
   logic             HREADYEXT, HRESPEXT;
   logic [31:0]      HADDR;