restored earlier text, but with new footnote
fixed conflicts and restored original text

and added footnote
fixed conflicts

added footnote to old text
fixed sync conflicts

better things to do with my time