Using the new base, merge in the old commits needed.