Update History with merge commits
Prepare for release