git-pull doc: fix grammo ("conflicts" is plural)