app/views/comments/_index.html.erb
fixed conflict