Remove merge remnats. Correct manpage.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>