created index.rb
resolved merge conflict