rm generator
merge