Fixing future.tex
fixing merge conflicts