Try again at fixing that bad merge.