improve RestClient
resolve conflicts