merge file

merge deploye.rb change