Resolve README conflicts