added client.tex
fixed conflict