merge ci/deploy.rb from review