adding gemfile and db.yml to push hopefully db.yml is ignored
adding env vars to db.yml
fix conflicts; push new migrations
add env variable to yml