merge proxy settings