Re: [Wikitech-l] Git/gerrit and RELEASE-NOTES-1.20 merge conflicts