Update History to reflect merge commits