Adds input function
Resolves hello.rb conflict
Updates Conflict 1 status