musashi: emrged upstream history.txt