Conflicts resolve with heroku for sqlite