add index and show views
resolve merge conflict
resolve second merge conflict