Update History with merge commits