fixing heroku conflicts
fixing heroku conflicts
bundle updating sqlite3
taps conflict