[Wikitech-l] CONFLICT (content): Merge conflict in RELEASE-NOTES-1.23