update history
merge