Add footnote support
Resolve merge conflict