diff --git a/config/routes.rb b/config/routes.rb
index 6615706c0..94e715271 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,4 @@
 Growstuff::Application.routes.draw do
-<<<<<<< HEAD
   resources :gardens
   resources :updates
   resources :scientific_names