Merge Proxy

• proxy.yaml