Merging upgrade.txt