Merge static and proxies