modified demo.tex
Fixing merge conflicts