diff --git a/config/routes.rb b/config/routes.rb
index 8fe3992f..4fd158b8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -72,15 +72,9 @@ Rails.application.routes.draw do
   #--------- Cashier ------------#
   namespace :origami do
     root "home#index"
-<<<<<<< HEAD
-    get "/:booking_id" => "home#index" do #origami/:booking_id will show
-      # resources :discounts, only: [:index,:new, :create ] #add discount type      
-      resources :customers, only: [:index,:new, :create ] #add customer type
-=======
     get "/:booking_id" => "home#show" do #origami/:booking_id will show
-      resources :discounts, only: [:index,:new, :create ] #add discount type
+      # resources :discounts, only: [:index,:new, :create ] #add discount type
       resources :customers #add customer type
->>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3
     end
 
     post '/:booking_id' => 'home#item_show'
@@ -96,12 +90,10 @@ Rails.application.routes.draw do
     post 'paypar_payment_process' => 'paypar_payments#create'
     get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index"
     get 'sale/:sale_id/payment/others_payment' => "others_payments#index"
-<<<<<<< HEAD
     # get 'sale/:sale_id/payment/others_payment/:payment_method' => "redeem_payments#index"
     get 'sale/:sale_id/payment/others_payment/MPU' => "mpu#index"
     post 'create_mpu_payment' => "mpu#create"
     get 'sale/:sale_id/payment/others_payment/REDEEMREBATE' => "redeem_payments#index"
-=======
 
     #---------Add Customer --------------#
     #resources :customers
@@ -109,7 +101,6 @@ Rails.application.routes.draw do
     get '/:customer_id/get_customer' => 'home#get_customer'
     post '/:sale_id/update_sale' , to: "home#update_sale_by_customer"#update customer id in sale table
 
->>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3
   end
 
   #--------- Waiter/Ordering Station ------------#