Update History with merge commits

[skip ci]