diff --git a/app/controllers/settings/cashier_terminals_controller.rb b/app/controllers/settings/cashier_terminals_controller.rb
index 0808c0a7..3f87de5f 100644
--- a/app/controllers/settings/cashier_terminals_controller.rb
+++ b/app/controllers/settings/cashier_terminals_controller.rb
@@ -70,6 +70,6 @@ class Settings::CashierTerminalsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_cashier_terminal_params
-      params.require(:cashier_terminal).permit(:name, :is_active, :is_currently_login, :auto_print_receipt, :printer_name, :header, :footer, :font, :font_size, :show_tax, :show_cashier, :show_guest_info)
+      params.require(:cashier_terminal).permit(:name, :is_active, :is_currently_login, :auto_print_receipt, :printer_name, :header, :footer, :font, :font_size, :show_tax, :show_cashier, :show_guest_info,{ zone_ids: [] })
     end
 end
diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb
index 72f910bc..73dea1f9 100644
--- a/app/controllers/settings/order_queue_stations_controller.rb
+++ b/app/controllers/settings/order_queue_stations_controller.rb
@@ -73,11 +73,6 @@ class Settings::OrderQueueStationsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_order_queue_station_params
-# <<<<<<< HEAD
-#      params.require(:order_queue_station).permit(:station_name, :is_active, :auto_print, :processing_items, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by)
-# =======
-# Don't Know { zone_ids: [] }
        params.require(:order_queue_station).permit(:station_name, :is_active, :processing_items, :auto_print, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by,{ zone_ids: [] })
-# >>>>>>> b093a993ba002c92659bbb34338c55c031c11d87
     end
 end
diff --git a/app/models/cashier_terminal.rb b/app/models/cashier_terminal.rb
index d99b84a0..4f642d0a 100644
--- a/app/models/cashier_terminal.rb
+++ b/app/models/cashier_terminal.rb
@@ -1,2 +1,4 @@
 class CashierTerminal < ApplicationRecord
+	has_many :cashier_terminal_by_zones 
+  	has_many :zones, through: :cashier_terminal_by_zones
 end
diff --git a/app/models/cashier_terminal_by_zone.rb b/app/models/cashier_terminal_by_zone.rb
new file mode 100644
index 00000000..0f991d52
--- /dev/null
+++ b/app/models/cashier_terminal_by_zone.rb
@@ -0,0 +1,4 @@
+class CashierTerminalByZone < ApplicationRecord
+	belongs_to :zone
+  	belongs_to :cashier_terminal
+end
diff --git a/app/models/zone.rb b/app/models/zone.rb
index 164b80f4..daef0c8b 100644
--- a/app/models/zone.rb
+++ b/app/models/zone.rb
@@ -3,6 +3,7 @@ class Zone < ApplicationRecord
  has_many :tables, dependent: :destroy
  has_many :rooms, dependent: :destroy
  has_many :order_queue_stations
+ has_many :cashier_terminals
 
  # validations
  validates_presence_of :name, :created_by
diff --git a/app/views/settings/cashier_terminals/_form.html.erb b/app/views/settings/cashier_terminals/_form.html.erb
index 95f21f07..1ba525e6 100644
--- a/app/views/settings/cashier_terminals/_form.html.erb
+++ b/app/views/settings/cashier_terminals/_form.html.erb
@@ -8,6 +8,8 @@
       <%= f.input :is_active %>
       <%= f.input :is_currently_login %>
       <%= f.input :auto_print_receipt %>
+      <%= f.label "Select Zones", :class => 'control-label' %>
+      <%= f.collection_check_boxes :zone_ids , Zone.all, :id, :name , :class => 'checkbox'%>
       <%= f.input :printer_name %>
       <%= f.input :font %>
       <%= f.input :font_size %>
diff --git a/db/migrate/20171023032411_create_cashier_terminal_by_zones.rb b/db/migrate/20171023032411_create_cashier_terminal_by_zones.rb
new file mode 100644
index 00000000..82aca5d5
--- /dev/null
+++ b/db/migrate/20171023032411_create_cashier_terminal_by_zones.rb
@@ -0,0 +1,10 @@
+class CreateCashierTerminalByZones < ActiveRecord::Migration[5.1]
+  def change
+    create_table :cashier_terminal_by_zones do |t|
+      t.references :cashier_terminal, :null => false
+      t.references :zone, :null => false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/spec/models/cashier_terminal_by_zone_spec.rb b/spec/models/cashier_terminal_by_zone_spec.rb
new file mode 100644
index 00000000..bd67fcbf
--- /dev/null
+++ b/spec/models/cashier_terminal_by_zone_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CashierTerminalByZone, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end