addendum to Way Beyond Weight
tweaks Merge vs. Rebase