fixed minor errors in demo and testing.tex
fixing merge conflicts