Playlist - Conflict Resolution Part 2