fix broken merge in man page