diff --git a/app/controllers/conflicts_controller.rb b/app/controllers/conflicts_controller.rb
index c76ca33..f6dfd82 100644
--- a/app/controllers/conflicts_controller.rb
+++ b/app/controllers/conflicts_controller.rb
@@ -1,5 +1,5 @@
 class ConflictsController < ApplicationController
   def index
-    @talks = Talk.find(:all, from: :halfnarp_friendly).sort_by(&:title)
+    @talks = Talk.ordered_by_rating
   end
 end