diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index c272b411fe..b4e7efaa5d 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -426,7 +426,6 @@ PipelineCache::PipelineCache(Tegra::MaxwellDeviceMemoryManager& device_memory_,
 
     LOG_INFO(Render_Vulkan, "DynamicState value is set to {}", (u32) dynamic_state);
 
-<<<<<<< HEAD
     dynamic_features = {};
     // EDS1 - All-or-nothing (enabled if driver supports AND setting > 0)
     dynamic_features.has_extended_dynamic_state = device.IsExtExtendedDynamicStateSupported() && dynamic_state > 0;
@@ -455,22 +454,6 @@ PipelineCache::PipelineCache(Tegra::MaxwellDeviceMemoryManager& device_memory_,
     dynamic_features.has_extended_dynamic_state_3_rasterization_stream = device.IsExtExtendedDynamicState3RasterizationStreamSupported() && dynamic_state > 2;
     // Vertex input dynamic state (independent toggle)
     dynamic_features.has_dynamic_vertex_input = device.IsExtVertexInputDynamicStateSupported() &&  Settings::values.vertex_input_dynamic_state.GetValue();
-=======
-    dynamic_features = DynamicFeatures{
-        // EDS1 - All-or-nothing (enabled if driver supports AND setting > 0)
-        .has_extended_dynamic_state = device.IsExtExtendedDynamicStateSupported() && dynamic_state > 0,
-        
-        // EDS2 - Core features (enabled if driver supports AND setting > 1)
-        .has_extended_dynamic_state_2 = device.IsExtExtendedDynamicState2Supported() && dynamic_state > 1,
-        .has_extended_dynamic_state_2_logic_op = device.IsExtExtendedDynamicState2LogicOpSupported() && dynamic_state > 1,
-        .has_extended_dynamic_state_2_patch_control_points = device.IsExtExtendedDynamicState2PatchControlPointsSupported() && dynamic_state > 1,
-        
-        // EDS3 - Granular features (enabled if driver supports AND setting > 2)
-        .has_extended_dynamic_state_3_blend = device.IsExtExtendedDynamicState3BlendingSupported() && dynamic_state > 2,
-        .has_extended_dynamic_state_3_enables = device.IsExtExtendedDynamicState3EnablesSupported() && dynamic_state > 2,
-        .has_dynamic_vertex_input = device.IsExtVertexInputDynamicStateSupported() && dynamic_state > 0,
-    };
->>>>>>> a35e761f82c3e9285fc0f3b819a0031807f26b74
 }
 
 PipelineCache::~PipelineCache() {
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
index c3a40e35f7..5e1b270496 100644
--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp
+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
@@ -969,7 +969,6 @@ void RasterizerVulkan::UpdateDynamicStates() {
             UpdateStencilTestEnable(regs);
         }
     }
-<<<<<<< HEAD
 
     // EDS2 - Extended Dynamic State 2 Core
     if (dynamic_features.has_extended_dynamic_state_2) {
@@ -1041,11 +1040,9 @@ void RasterizerVulkan::UpdateDynamicStates() {
     // Vertex Input Dynamic State
     if (dynamic_features.has_dynamic_vertex_input) {
         if (auto* gp = pipeline_cache.CurrentGraphicsPipeline(); gp && gp->HasDynamicVertexInput()) {
-=======
-    if (device.IsExtVertexInputDynamicStateSupported() && dynamic_state > 0)
-        if (auto* gp = pipeline_cache.CurrentGraphicsPipeline(); gp && gp->HasDynamicVertexInput())
->>>>>>> a35e761f82c3e9285fc0f3b819a0031807f26b74
             UpdateVertexInput(regs);
+        }
+    }
 }
 
 void RasterizerVulkan::HandleTransformFeedback() {