Footnotes added
conflict resolution