fixed conflict

app/controllers/api/api_controller.rb

@@ -5,6 +5,7 @@ class Api::ApiController < ActionController::API
   before_action :core_allow
   helper_method :current_token, :current_login_employee, :get_cashier
 
+  before_action :core_allow 
 
   def core_allow
     headers['Access-Control-Allow-Origin'] = '*'
@@ -14,6 +15,7 @@ class Api::ApiController < ActionController::API
   end
 
   private
+
   #this is base api base controller to need to inherit.
   #all token authentication must be done here
   #response format must be set to JSON