Resolve leftover merge conflicts in History.md