update readme
resolve conflict