main config
Merge branch 'ren'