--merge-mode 1 bugfix.  next: use word-based operations to make this code suck less