Minor revisions
resolved conflict