Add proxy option merge
Add proxy option merge