argh. don't click the "Retry Merge" button in the github web ui. it won't use the message you created.