Resolve README conflict