diff --git a/share/linters/.rubocop.yml b/share/linters/.rubocop.yml
index 617c96426d..fb42f111f8 100644
--- a/share/linters/.rubocop.yml
+++ b/share/linters/.rubocop.yml
@@ -748,7 +748,6 @@ Style/SoleNestedConditional:
 
 Style/StringConcatenation:
   Enabled: false
->>>>>>> one-5.12-new
 
 ######
 # LINT
@@ -855,7 +854,6 @@ Lint/UselessMethodDefinition:
 Lint/UselessTimes:
   Enabled: true
 
->>>>>>> one-5.12-new
 #########
 # METRICS
 ########
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 3662d0479e..e56c580917 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -3702,5 +3702,3 @@ void VirtualMachine::rollback_previous_vnc_port()
 
     graphics->remove("PREVIOUS_PORT");
 };
-
->>>>>>> one-5.12-new