diff --git a/README.md b/README.md
index 35dc5b0e..a175d15e 100644
--- a/README.md
+++ b/README.md
@@ -74,6 +74,13 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
 - Newer compression options are supported.
 - UNFLoader (flashcart USB library) is supported, allowing for debugging on EverDrive/64Drive.
 - It has been patched with someone2639's shiftable segments patch
+<<<<<<< HEAD
+=======
+- Wiseguy's instant input patch has been added to allow for less input lag on emulation (Does not affect console)
+  This does mean that any framebuffer effects will have to be done on buffer 0 if targeting emulators
+- Automatic console and emulator detection: Use the `gIsConsole` variable to wrap your code in an emulator check.
+- Separate defines for emulator and console black border height.
+>>>>>>> 225c1eef55c40d77f3ec9991248fefd390c788d8
 - Getting HVQM FMV support to work with the game is WIP.
 
 Requirements are the same as regular SM64, however a GCC MIPS cross compiler is also required. If you're on Debian-like Linux, you can use the ``gcc-mips-linux-gnu`` package. The toolchain that comes with my SDK is also supported.
diff --git a/bin/segment2.c b/bin/segment2.c
index eb2bdb3a..bcdb36c9 100644
--- a/bin/segment2.c
+++ b/bin/segment2.c
@@ -2097,14 +2097,8 @@ const Gfx dl_hud_img_begin[] = {
     gsDPSetTexturePersp(G_TP_NONE),
     gsDPSetAlphaCompare(G_AC_THRESHOLD),
     gsDPSetBlendColor(255, 255, 255, 255),
-#if defined(VERSION_EU) || defined(VERSION_SH)
     gsDPSetRenderMode(G_RM_NOOP, G_RM_NOOP2),
-#endif
-#ifdef VERSION_EU
     gsDPSetTextureFilter(G_TF_POINT),
-#elif defined(VERSION_JP) || defined(VERSION_US)
-    gsDPSetRenderMode(G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2),
-#endif
     gsSPEndDisplayList(),
 };
 
@@ -2124,13 +2118,8 @@ const Gfx dl_hud_img_end[] = {
     gsDPSetTexturePersp(G_TP_PERSP),
     gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
     gsDPSetAlphaCompare(G_AC_NONE),
-#ifdef VERSION_EU
     gsDPSetTextureFilter(G_TF_BILERP),
-#endif
     gsDPSetCycleType(G_CYC_1CYCLE),
-#if defined(VERSION_JP) || defined(VERSION_US)
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
-#endif
     gsSPEndDisplayList(),
 };
 
diff --git a/include/config.h b/include/config.h
index 0a233f3a..eecff479 100644
--- a/include/config.h
+++ b/include/config.h
@@ -35,11 +35,24 @@
 
 // Border Height Define for NTSC Versions
 #ifdef TARGET_N64
+<<<<<<< HEAD
 // Size of the black border at the top and bottom of the screen. You can set it to different values for console and emulator.
 // There is generally no reason to have a value other than 0 for emulator. As for console, it provides a (small) performance boost.
 #define BORDER_HEIGHT_CONSOLE 0
 #define BORDER_HEIGHT_EMULATOR 0
 
+=======
+#ifndef VERSION_EU
+#define BORDER_HEIGHT_CONSOLE 8
+#define BORDER_HEIGHT_EMULATOR 0
+#else
+#define BORDER_HEIGHT_CONSOLE 1
+#define BORDER_HEIGHT_EMULATOR 0
+#endif
+#else
+#define BORDER_HEIGHT_CONSOLE 0
+#define BORDER_HEIGHT_EMULATOR 0
+>>>>>>> 225c1eef55c40d77f3ec9991248fefd390c788d8
 #endif
 
 // -- ultrasm64-extbounds specific settings --
diff --git a/src/game/game_init.c b/src/game/game_init.c
index ca1b42cb..55a49cce 100644
--- a/src/game/game_init.c
+++ b/src/game/game_init.c
@@ -41,6 +41,8 @@ struct GfxPool *gGfxPool;
 OSContStatus gControllerStatuses[4];
 OSContPad gControllerPads[4];
 u8 gControllerBits;
+u8 gIsConsole;
+u8 gBorderHeight;
 #ifdef EEP
 s8 gEepromProbe;
 #endif