github_merge: copy the merge message for commit when conflict

so the following commit will be pre-rendered