Footnotes and map work.
Resolve conflicts.