minor busybear fixes

wally-pipelined/regression/wally-busybear.do

@@ -35,7 +35,8 @@ vopt +acc work.testbench -o workopt
 
 vsim workopt -suppress 8852,12070
 
-do ./wave-dos/peripheral-waves.do
+#do ./wave-dos/peripheral-waves.do
+do ./wave-dos/busybear-waves.do
 
 #-- Run the Simulation 
 run -all

wally-pipelined/testbench/testbench-busybear.sv

@@ -1,21 +1,7 @@
 `include "wally-config.vh"
 
 
-// *** Noah please check which way you need to fix the merge conflict.
-// Ross was not sure.
-// merge conflict main
 module testbench();
-
-/* -----\/----- EXCLUDED -----\/-----
- // merge conflict icache-almost-ready
-package ahbliteState;
-  typedef enum {IDLE, MEMREAD, MEMWRITE, INSTRREAD, INSTRREADC, ATOMICREAD, ATOMICWRITE, MMUTRANSLATE} statetype;
-endpackage
-
-module testbench_busybear();
- -----/\----- EXCLUDED -----/\----- */
-
-
   logic            clk, reset;
   logic [31:0]     GPIOPinsIn;
   logic [31:0]     GPIOPinsOut, GPIOPinsEn;