improve config merge to handle Entity rewrites