quasselclient: fix remaining file conflicts with quassel.