Merge two different changes to upgrade.php

Signed-Off-by: Angelina Belle <angelinabelle1@hotmail.com>