playlist index, show, new, edit views
index merge conflict resolve