Change override behavior to merge override.cfg into client.cfg