agent: Fixing config merge issue