diff --git a/src/main/java/rip/athena/client/ui/menu/altmanager/GuiAccountManager.java b/src/main/java/rip/athena/client/ui/menu/altmanager/GuiAccountManager.java
index 448c1596..44b58739 100644
--- a/src/main/java/rip/athena/client/ui/menu/altmanager/GuiAccountManager.java
+++ b/src/main/java/rip/athena/client/ui/menu/altmanager/GuiAccountManager.java
@@ -139,16 +139,9 @@ public class GuiAccountManager extends GuiScreen {
             FontManager.getProductSansRegular(22).drawString("Empty...", sr.getScaledWidth() / 2 - (FontManager.getProductSansRegular(22).height() / 2), (sr.getScaledHeight() / 2) - (FontManager.getProductSansRegular(22).height() / 2), Athena.INSTANCE.getThemeManager().getPrimaryTheme().getTextColor());
         }
 
-<<<<<<< HEAD
         ScaledResolution resolution = new ScaledResolution(mc);
         GL11.glScissor(x * resolution.getScaleFactor(),
                 (y + 3) * resolution.getScaleFactor(),
-=======
-        Minecraft mc = Minecraft.getMinecraft();
-        ScaledResolution resolution = new ScaledResolution(mc);
-        GL11.glScissor(x * resolution.getScaleFactor(),
-                (y) * resolution.getScaleFactor(),
->>>>>>> e4d318b9e5b57e44e812911ed659152d9550da95
                 width * resolution.getScaleFactor(),
                 (height - 25) * resolution.getScaleFactor()
         );
@@ -193,13 +186,7 @@ public class GuiAccountManager extends GuiScreen {
         }
 
         GL11.glDisable(GL11.GL_SCISSOR_TEST);
-<<<<<<< HEAD
         GLUtils.stopTranslate();
-=======
-
-        GLUtils.stopTranslate();
-
->>>>>>> e4d318b9e5b57e44e812911ed659152d9550da95
         StencilUtils.uninitStencilBuffer();
         GLUtils.stopScale();