fix services null bug in remote and proxy
resolve conflict