Weird conflic in development branch, hav to re-add client