Add proxy option merge