fix errors in git pull