diff --git a/npc/core/src/main/scala/Main.scala b/npc/core/src/main/scala/Main.scala
index 95b9e61..bf1ffab 100644
--- a/npc/core/src/main/scala/Main.scala
+++ b/npc/core/src/main/scala/Main.scala
@@ -33,12 +33,9 @@ class Keyboard extends Module {
   io.segs := seg_handler.io.segs
 }
 
-<<<<<<< Updated upstream
-=======
 class Flowpc extends Module {
   val io = IO(new Bundle { })
   val register_file = new RegisterFile(readPorts = 2);
   val pc = new ProgramCounter(32);
   val adder = new SRAM()
 }
->>>>>>> Stashed changes