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

Signed-off-by: Mihai Capotă <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>

Author: mihaic

Documentation/git-pull.txt

@@ -218,7 +218,7 @@ $ git merge origin/next
 ------------------------------------------------
 
 
-If you tried a pull which resulted in a complex conflicts and
+If you tried a pull which resulted in complex conflicts and
 would want to start over, you can recover with 'git reset'.