Edited example.rb
Fixed conflict in example.rb