fixed conflict

config/database.yml

@@ -11,7 +11,7 @@ default: &default
 
 development:
   <<: *default
-  database: nemo_encoder
+  database: nemo_encoder_production
   username: nda  
 
 # Warning: The database defined as "test" will be erased and
@@ -19,7 +19,7 @@ development:
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: nemo_encoder
+  database: nemo_encoder_production_test
 
 production:
   <<: *default

db/schema.rb

@@ -54,11 +54,9 @@ ActiveRecord::Schema.define(version: 20170210103359) do
 
   create_table "clients", force: :cascade do |t|
     t.string   "name",          null: false
-    t.string   "nrc"
     t.string   "email"
     t.string   "phone"
     t.string   "address"
-    t.string   "product_type"
     t.string   "secrect_key"
     t.datetime "created_at",    null: false
     t.datetime "updated_at",    null: false