fix merge fuckup in image.php