minor revisions to resolve conflic