add heroku
merge fail
solve gemfile.lock
fix yuor -> your