Update History.txt

Resolving conflicts