conflicted index.html.erb has be fixed