Changes to tpe.pdf
Fix conflict