diff --git a/module/common.h b/module/common.h
index a80970c..47ceb6b 100644
--- a/module/common.h
+++ b/module/common.h
@@ -8,7 +8,6 @@
 #include <vector>
 
 #define LOG_INFO(fmt, ...) printf("[+] " fmt "\n", ##__VA_ARGS__)
-um-rewrite-final
 #define LOG_ERROR(fmt, ...) printf("[-] " fmt "\n", ##__VA_ARGS__)
 
 #define ABSOLUTE(wait) (wait)
@@ -18,6 +17,4 @@ um-rewrite-final
 #define MICROSECONDS(micros) (((signed __int64)(micros)) * NANOSECONDS(1000L))
 #define MILLISECONDS(milli) (((signed __int64)(milli)) * MICROSECONDS(1000L))
 #define SECONDS(seconds) (((signed __int64)(seconds)) * MILLISECONDS(1000L))
-=======
 #define LOG_ERROR(fmt, ...) printf("[-] " fmt "\n", ##__VA_ARGS__)
-master
diff --git a/module/dispatcher/dispatcher.cpp b/module/dispatcher/dispatcher.cpp
index 87a8506..cad8071 100644
--- a/module/dispatcher/dispatcher.cpp
+++ b/module/dispatcher/dispatcher.cpp
@@ -10,7 +10,6 @@ dispatcher::dispatcher::dispatcher(LPCWSTR driver_name,
     : thread_pool(DISPATCHER_THREAD_COUNT),
       k_interface(driver_name, message_queue) {}
 
-um-rewrite-final
 void dispatcher::dispatcher::timer_test_callback() {
   LOG_INFO("Timer callback invoked from dispatcher class!!");
 }
@@ -33,11 +32,7 @@ void dispatcher::dispatcher::run() {
   this->init_timer_callbacks();
   this->run_timer_thread();
   this->run_io_port_thread();
-=======
-void dispatcher::dispatcher::run() {
-  helper::generate_rand_seed();
   thread_pool.queue_job([this]() { k_interface.run_completion_port(); });
-master
   while (true) {
     this->issue_kernel_job();
     helper::sleep_thread(DISPATCH_LOOP_SLEEP_TIME);
diff --git a/module/dispatcher/dispatcher.h b/module/dispatcher/dispatcher.h
index a510ebc..2f75cec 100644
--- a/module/dispatcher/dispatcher.h
+++ b/module/dispatcher/dispatcher.h
@@ -2,10 +2,7 @@
 
 #include "threadpool.h"
 
-um-rewrite-final
 #include "timer.h"
-=======
-master
 #include "../kernel_interface/kernel_interface.h"
 
 namespace dispatcher {
@@ -15,21 +12,15 @@ static const int KERNEL_DISPATCH_FUNCTION_COUNT = 11;
 static const int DISPATCHER_THREAD_COUNT = 4;
 
 class dispatcher {
-um-rewrite-final
   timer timers;
-=======
-master
   thread_pool thread_pool;
   kernel_interface::kernel_interface k_interface;
 
   void issue_kernel_job();
-um-rewrite-final
   void timer_test_callback();
   void init_timer_callbacks();
   void run_timer_thread();
   void run_io_port_thread();
-=======
-master
 
 public:
   dispatcher(LPCWSTR driver_name, client::message_queue &queue);
diff --git a/module/helper.cpp b/module/helper.cpp
index e1a7b7b..ef09267 100644
--- a/module/helper.cpp
+++ b/module/helper.cpp
@@ -166,7 +166,6 @@ void helper::print_kernel_report(void *buffer) {
     LOG_INFO("Invalid report type.");
     break;
   }
-um-rewrite-final
 }
 
 unsigned __int64 helper::seconds_to_nanoseconds(int seconds) {
@@ -175,7 +174,4 @@ unsigned __int64 helper::seconds_to_nanoseconds(int seconds) {
 
 unsigned __int32 helper::seconds_to_milliseconds(int seconds) {
   return seconds * 1000;
-}
-=======
-}
-master
+}
\ No newline at end of file
diff --git a/module/helper.h b/module/helper.h
index b979695..5610b3d 100644
--- a/module/helper.h
+++ b/module/helper.h
@@ -9,9 +9,6 @@ void sleep_thread(int seconds);
 kernel_interface::report_id get_kernel_report_type(void *buffer);
 int get_report_id_from_buffer(void *buffer);
 void print_kernel_report(void *buffer);
-um-rewrite-final
 unsigned __int64 seconds_to_nanoseconds(int seconds);
 unsigned __int32 seconds_to_milliseconds(int seconds);
-=======
-master
 } // namespace helper
\ No newline at end of file
diff --git a/module/kernel_interface/kernel_interface.h b/module/kernel_interface/kernel_interface.h
index 8b9a537..3708b2a 100644
--- a/module/kernel_interface/kernel_interface.h
+++ b/module/kernel_interface/kernel_interface.h
@@ -216,9 +216,6 @@ public:
   void verify_process_module_executable_regions();
   void initiate_apc_stackwalk();
   void send_pending_irp();
-um-rewrite-final
-=======
   void query_deferred_reports();
-master
 };
 } // namespace kernel_interface
\ No newline at end of file
diff --git a/module/module.vcxproj b/module/module.vcxproj
index 4355b45..0747bf3 100644
--- a/module/module.vcxproj
+++ b/module/module.vcxproj
@@ -140,10 +140,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-um-rewrite-final
     <ClCompile Include="dispatcher\timer.cpp" />
-=======
-master
     <ClCompile Include="helper.cpp" />
     <ClCompile Include="imports.cpp" />
     <ClCompile Include="module.cpp" />
@@ -160,10 +157,7 @@ master
     <ClInclude Include="dispatcher\dispatcher.h" />
     <ClInclude Include="dispatcher\threadpool.h" />
     <ClInclude Include="common.h" />
-um-rewrite-final
     <ClInclude Include="dispatcher\timer.h" />
-=======
-master
     <ClInclude Include="helper.h" />
     <ClInclude Include="imports.h" />
     <ClInclude Include="kernel_interface\kernel_interface.h" />