Fix client not able to merge config