fix conflict after merging KalturaSupport.php