Fixed messed up MediaController.php merge