update script
merge