Added git-latex
Resolving conflict