Just realized that I had broken stuff when I was conflict resolving.  Not sure if it's back to the way it was before as I don't get any pictures in the playlist collection view