flash notice
fixed conflicts in index.html.erb