Updating LaTeX document
resolving conflicts