update scripts and merge