renew after git merge