Endnotexml

Fix merge conflicts