added remove video/playlist database functions
conflict resolve