added 4th line
fixed conflicts
Update first.rb
fixed conflicts