[sudo-discuss] Reminder: conflict resolution draft to be voted on again this evening