capistrano merge

as title