capfile
capistrano fixed conflicts