uplaod fixed
merge photoinfo