update pano
merge