Podcast Conflict fixes

-Fixed some additional conflict stuff in podcasts.php