merge: add instructions to the commit message when editing