heroku ken gen
git mergetool ediff to merge