DVDPlayer: Fix merges - squash me later