pulling tex file
fix merge conflict