[ConfigManager] Fix merge config behavior
Update CHANGELOG