diff --git a/src/exe/main.h b/src/exe/main.h
index b3a37db..58a555a 100644
--- a/src/exe/main.h
+++ b/src/exe/main.h
@@ -6,12 +6,8 @@
 #define MATCH(s, n) strcmp(section, s) == 0 && strcmp(name, n) == 0
 
 char useDebug = TRUE;
-<<<<<<< Updated upstream
-DWORD64 SprjFlipper = 0x14489DD20;
-=======
 DWORD64 SprjFlipper;
 
->>>>>>> Stashed changes
 RECT final;
 
 NTSYSAPI NTSTATUS NTAPI NtReadVirtualMemory(HANDLE ProcessHandle, void *BaseAddress, const void *Buffer,