Update index content and merged Petes content
Fixed conflict and removed keys (after changing)