Just did rails generate ... on master branch
added by Alex in the view file.
Resolved the conflict in hello.html.erb