add history file
Merge branch 'patches' into config