Fix conflicts in db upgrade script

Signed-off-by: walteryang47 <walteryang47@gmail.com>