fix  url for staging
fix merge conflicts