Now make the patch by hand that fossil could not merge.
And then another merge mark to finish.