update history
merge history