change history.rst
change history.rst
merge