merge remote and VPN codes