Small changed to pers. gen program
Fixing merge confs