Fix merge conflict.
Add required gems for heroku.