fixed conflict

db/migrate/20170403140820_create_order_items.rb

@@ -13,6 +13,7 @@ class CreateOrderItems < ActiveRecord::Migration[5.1]
       t.string :options
       t.json :set_menu_items #this parameter is require to route the items correctly
       t.boolean :taxable, :null => false, :default => true
+      t.string :completed_by
       t.timestamps
     end
   end

db/migrate/20170403153001_create_payment_method_settings.rb

@@ -7,7 +7,7 @@ class CreatePaymentMethodSettings < ActiveRecord::Migration[5.1]
       t.string :gateway_url
       t.string :auth_token
       t.string :merchant_account_id
-
+      t.string :additional_parameters
       t.timestamps
     end
   end

db/migrate/20170403174029_create_sale_orders.rb

@@ -1,8 +1,8 @@
 class CreateSaleOrders < ActiveRecord::Migration[5.1]
   def change
     create_table :sale_orders, :id => false do |t|
-      t.primary_key :sale_order_id #custom primary key - to ensure consistence for cloud syncing
-
+      
+      t.string :sale_order_id, :limit => 16, :primary_key => true
       t.string :sale_id, foreign_key: true,:limit => 16
       t.string :order_id, foreign_key: true, :limit => 16
 

db/migrate/20170421171849_add_company_address_email.rb

@@ -1,5 +0,0 @@
-class AddCompanyAddressEmail < ActiveRecord::Migration[5.1]
-  def change
-  		add_column :order_items, :completed_by, :string
-  end
-end

db/migrate/20170608111602_additionparametertopaymentsettings.rb

@@ -1,5 +0,0 @@
-class Additionparametertopaymentsettings < ActiveRecord::Migration[5.1]
-  def change
-  		add_column :payment_method_settings, :additional_parameters, :string
-  end
-end

db/migrate/20170611084537_create_membership_actions.rb

@@ -1,14 +1,14 @@
-class CreateSettingsMembershipActions < ActiveRecord::Migration[5.1]
+class CreateMembershipActions < ActiveRecord::Migration[5.1]
   def change
-    create_table :settings_membership_actions do |t|
-      t.string :membership_type
+    create_table :membership_actions do |t|
+    	t.string :membership_type
       t.boolean :is_active
       t.string :gateway_communication_type
       t.string :gateway_url
       t.string :auth_token
       t.string :merchant_account_id
       t.string :created_by
-      t.string :additional_parameter
+      t.jsonb :additional_parameter
 
       t.timestamps
     end