Clean up merge issue in block_panopto.php