diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index cf18ae9b..df00e24c 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,12 +1,8 @@
 class HomeController < ApplicationController  
   # layout "application", except: [:index, :show]
-<<<<<<< HEAD
   skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy] 
 
   helper_method :shop_detail 
-=======
-  # skip_before_action only: [:index, :show, :create, :update, :destroy]  
->>>>>>> 311bef44119baa113cfadf226d6d34e04cfbe991
 
   def index
     # @employees = Employee.all_emp_except_waiter.order("name asc")