heroku
removing sql
removing sql
fixing merge