reconciling diffs between local and heroku