add rest client initial
resolve conflict