Update README
Resolve README conflict