resolve conflict
weechat updates
fix some directory aliases and stuff
fix some missing bundles