updated index.erb
fixing merge conflict