finishing tex
fixing merge