wiki wordwrap
fixed merge