Auto-merging config/deploy.rb