changed h1 tag in index.erb
fixed merge conflict
fix page