Delete index.html (Fernando Carvalho's conflicted copy 2013-09-08).erb~