Update index.html.erb

Fixed merging issues