diff --git a/src/shader_recompiler/frontend/translate/vector_alu.cpp b/src/shader_recompiler/frontend/translate/vector_alu.cpp
index 2d7ec879..17834a79 100644
--- a/src/shader_recompiler/frontend/translate/vector_alu.cpp
+++ b/src/shader_recompiler/frontend/translate/vector_alu.cpp
@@ -396,23 +396,12 @@ void Translator::V_LSHL_B32(const GcnInst& inst) {
 
 void Translator::V_LSHL_B64(const GcnInst& inst) {
     const IR::U64 src0{GetSrc64(inst.src[0])};
-<<<<<<< HEAD
     const IR::U64 src1{GetSrc64(inst.src[1])};
     const IR::VectorReg dst_reg{inst.dst[0].code};
     ASSERT_MSG(src0.IsImmediate() && src0.U64() == 0 && src1.IsImmediate() && src1.U64() == 0,
                "V_LSHL_B64 with non-zero src0 or src1 is not supported");
     ir.SetVectorReg(dst_reg, ir.Imm32(0));
     ir.SetVectorReg(dst_reg + 1, ir.Imm32(0));
-=======
-    const IR::U32 src1{GetSrc(inst.src[1])};
-    SetDst64(inst.dst[0], ir.ShiftLeftLogical(src0, ir.BitwiseAnd(src1, ir.Imm32(0x3F))));
-}
-
-void Translator::V_LSHR_B64(const GcnInst& inst) {
-    const IR::U64 src0{GetSrc64(inst.src[0])};
-    const IR::U32 src1{GetSrc(inst.src[1])};
-    SetDst64(inst.dst[0], ir.ShiftRightLogical(src0, ir.BitwiseAnd(src1, ir.Imm32(0x3F))));
->>>>>>> d5af6c3 (clang-format)
 }
 
 void Translator::V_ADD_I32(const GcnInst& inst) {