got upgrade working
fixed merge issues and got upgrade working