fix conflit

config/routes.rb

@@ -2,12 +2,6 @@ require 'sidekiq/web'
 
 Rails.application.routes.draw do
 
-<<<<<<< HEAD
-  
-=======
-  resources :commissions
-  resources :commissioners
->>>>>>> 618f5f3b7c13500a65f89db46309e2a28daf5c8f
   root 'home#index'
   mount Sidekiq::Web => '/kiq'
 
@@ -175,6 +169,8 @@ Rails.application.routes.draw do
     post '/:sale_id/get_customer' => "customers#get_customer"
 
     resources :addorders
+    resources :commissions
+    resources :commissioners
   end
 
   #--------- Waiter/Ordering Station ------------#