fixed conflict

db/migrate/20170421171849_add_company_address_email.rb

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

db/migrate/20170507045043_order_items_completed_by.rb

@@ -1,6 +0,0 @@
-class OrderItemsCompletedBy < ActiveRecord::Migration[5.1]
-  def change
-    add_column :order_items, :completed_by, :string
-    add_column :order_items, :completed_at, :datetime
-  end
-end

db/migrate/20170602093159_create_print_settings.rb

@@ -3,10 +3,10 @@ class CreatePrintSettings < ActiveRecord::Migration[5.1]
     create_table :print_settings do |t|
       t.string  :name, :null => false
       t.string  :unique_code, :null => false
-      t.string  :template, :null => false
-      t.string  :db_name, :null => false
-      t.string  :db_type, :null => false
-      t.string  :db_username, :null => false
+      t.string  :template
+      t.string  :db_name 
+      t.string  :db_type
+      t.string  :db_username
       t.string  :db_password
       t.string  :printer_name, :null => false
       t.string  :api_settings

db/migrate/20170608104900_create_settings_membership_actions.rb

@@ -0,0 +1,16 @@
+class CreateSettingsMembershipActions < ActiveRecord::Migration[5.1]
+  def change
+    create_table :settings_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.timestamps
+    end
+  end
+end

db/migrate/20170608111602_additionparametertopaymentsettings.rb

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