my changes
my tex file before mergetool