update README
confict update