conflicts weechat-cvs
conflicts weechat-git
