irc-announce: fix conflict resolution fail