update readme
resolve merge