Resolve merge conflict from feature branch 80-export_refworks_endnote