new snippets for .tex files
merge conflict fixe