update tex
resolved conflict