update generator
merge