Use replacements for sunflower branch merge.

It's a bit too late to do a full replacement of the commits, but we can
do a 'git replace' on the merge commit instead.