[README] readme edit
[README] fix conflit