ConnectorManagerActor modify.
resolve conflic with merge.