merge  cfg changes