Start making merging back with quassel-irssi