Added LaTeX:definitions for simplicity
Conflicts fixed