conflicts weechat
conflicts weechat-git
