fixes merge conflicts in home/index.html.erb