Updated for heroku
Adding merge feature with content and comments