Add note about the merge to the mainline.