repush changes to heroku
try send_from dir again
fixed merges