fix: genere conf bug and update folder selection
Merge remote-tracking branch 'origin/master'