merge sphinx and client