diff --git a/app/views/budgets/show.html.erb b/app/views/budgets/show.html.erb
index 9a81e8079..fb56c04c3 100644
--- a/app/views/budgets/show.html.erb
+++ b/app/views/budgets/show.html.erb
@@ -39,7 +39,8 @@
       <% if @budget.finished? %>
         <div>
           <%= link_to "Results",
-                      budget_results_path(@budget, heading_id: @budget.headings.first) %>
+                      budget_results_path(@budget,
+                                          heading_id: @budget.headings.first) %>
         </div>
       <% end %>
     </div>
diff --git a/config/locales/budgets.es.yml b/config/locales/budgets.es.yml
index 8c824e2e2..1ba37b110 100644
--- a/config/locales/budgets.es.yml
+++ b/config/locales/budgets.es.yml
@@ -113,12 +113,8 @@ es:
       phase: Fase actual
       unfeasible_title: Propuestas inviables
       unfeasible: Ver las propuestas inviables
-<<<<<<< f0d7acd087346edce149efed36e057eb4b792a4c
       unselected_title: Propuestas no seleccionadas para la votación final
       unselected: Ver las propuestas no seleccionadas para la votación final
-=======
-      unselected_title: Propuestas que no pasan a la votación final
-      unselected: Ver las propuestas que no pasan a la votación final
     results:
       page_title: "Presupuestos participativos | Resultados"
       heading: "PRESUPUESTOS PARTICIPATIVOS"
@@ -134,4 +130,3 @@ es:
       incompatible: Incompatibles
       accepted: "Propuesta de inversión aceptada: "
       discarded: "Propuesta de inversión descartada: "
->>>>>>> adds budget results
diff --git a/spec/features/budgets/results_spec.rb b/spec/features/budgets/results_spec.rb
index 79f5d5ef0..c00562622 100644
--- a/spec/features/budgets/results_spec.rb
+++ b/spec/features/budgets/results_spec.rb
@@ -13,7 +13,7 @@ feature 'Results' do
 
   let!(:results) { Budget::Result.new(budget, heading).calculate_winners }
 
-  scenario "Diplays winner investments", :focus do
+  scenario "Diplays winner investments" do
     visit budget_path(budget)
     click_link "Results"
 
@@ -28,7 +28,7 @@ feature 'Results' do
     end
   end
 
-  scenario "Displays non winner investments", :js, :focus do
+  scenario "Displays non winner investments", :js do
     visit budget_path(budget)
     click_link "Results"
     click_link "Show all"
diff --git a/spec/models/budget/result_spec.rb b/spec/models/budget/result_spec.rb
index b01a05ac6..f96428221 100644
--- a/spec/models/budget/result_spec.rb
+++ b/spec/models/budget/result_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe Budget::Result, :focus do
+describe Budget::Result do
 
   describe "calculate_winners" do
     let(:budget) { create(:budget) }