regenerated site post upstream merge