manually merged

We needed to merge the private chat manually since github could not do
it automaticly