Fixed corrupted image issue from merge