user-manual: fix inconsistent use of pull and merge