merge sphinx and client
merge sphinx and client2