index.rb
merge conflict in index.rb