Removed the Context.tex output, it was just causing merge conflicts.