config fix
Merge