default generator
fixed merging