made index and partials
fixed merge conflict