change footnotes to code
changes to merge conflict