diff --git a/config/routes.rb b/config/routes.rb
index 63cc1e236e91e7c1d832da394ce4ab16c1070051..18bfc696708161038c61b0c299e3664cbbe48d17 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -66,12 +66,9 @@ Rails.application.routes.draw do
       post :like
       post :bookmarks
       get :collections
-<<<<<<< HEAD
       get :download
-=======
 
       resource :chunk, only: [:create, :show]
->>>>>>> master
     end
   end