update readme real
resolve conflict readme