runbot/runbot_merge/changelog/2021-09/conflict_authorship.md