Fix error with bad footnotes
conflict puts fixes
Merge branch 'zdenal-master'