diff --git a/Top/Top.sv b/Top/Top.sv
index 0e0361f..c85f29f 100644
--- a/Top/Top.sv
+++ b/Top/Top.sv
@@ -1,11 +1,15 @@
 `include "../spi_interface.v"
 `include "../fsm/Fsm.sv"
+<<<<<<< HEAD
 `include "../Bus_if/Bus_if.sv"
+=======
+>>>>>>> b8d834144be80086a32a76f1769deccce6eaee15
 
 module Top(
     input wire clk
 );
     // Bus (Interface)
+<<<<<<< HEAD
     Bus_if bus(.clk(clk));
     // SPI Interface
     // FSM
@@ -18,6 +22,10 @@ module Top(
         .outSendData(bus.SendData),
         .outTimerEN(bus.TimerEN)
     );
+=======
+    // SPI Interface
+    // FSM
+>>>>>>> b8d834144be80086a32a76f1769deccce6eaee15
     // Parallelport
     // FRAM-Controller
     // Timer