Update welcome_controller.rb

Fixed bad merge