quasselclient: resolve file conflicts with quassel.