diff --git a/src_Core/RISCY_OOO/procs/lib/DirPredictor.bsv b/src_Core/RISCY_OOO/procs/lib/DirPredictor.bsv
index a3aaa94..fe48ab1 100644
--- a/src_Core/RISCY_OOO/procs/lib/DirPredictor.bsv
+++ b/src_Core/RISCY_OOO/procs/lib/DirPredictor.bsv
@@ -63,10 +63,6 @@ typedef GShareTrainInfo DirPredTrainInfo;
 typedef TourTrainInfo DirPredTrainInfo;
 `endif
 
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
 (* synthesize *)
 module mkDirPredictor(DirPredictor#(DirPredTrainInfo));
 `ifdef DIR_PRED_BHT