From dc7adf4ccf204bf5ba0490debba95d94c2a6853d Mon Sep 17 00:00:00 2001
From: Desoroxxx <desoroxxx@gmail.com>
Date: Thu, 20 Jul 2023 01:55:47 +0200
Subject: [PATCH] Fix the merge

---
 .../java/com/paneedah/mwc/items/guns/Type20Factory.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/paneedah/mwc/items/guns/Type20Factory.java b/src/main/java/com/paneedah/mwc/items/guns/Type20Factory.java
index 0b29f3f14..b3bb3e052 100644
--- a/src/main/java/com/paneedah/mwc/items/guns/Type20Factory.java
+++ b/src/main/java/com/paneedah/mwc/items/guns/Type20Factory.java
@@ -293,10 +293,8 @@ else if(model instanceof AcogReticle) {
         .withCompatibleAttachment(Attachments.Bipod, renderContext -> {
             PlayerWeaponInstance instance = renderContext.getWeaponInstance();
             if(instance != null) {
-                ItemAttachment<Weapon> activeAttachment = WeaponAttachmentAspect.getActiveAttachment(
-                        AttachmentCategory.GUARD, instance);
-                if(activeAttachment == Attachments.ACRPrecisionHandGuard 
-                		|| activeAttachment == Attachments.ACRPrecisionHandGuardTan) {
+                ItemAttachment<Weapon> activeAttachment = WeaponAttachmentAspect.getActiveAttachment(AttachmentCategory.GUARD, instance);
+                if(activeAttachment == Attachments.ACRPrecisionHandGuardTan) {
                 	GL11.glTranslatef(-0.2F, -0.35F, -5F);
     	            GL11.glScaled(1F, 1F, 1F);
                 } else {