update the comment in git pull on the local machine
resolve the conflict in the comment in git pull