github_merge: copy the merge message for commit when conflict