minor correction to upgrade path
minor conflict