minor revisions
fixing merge?
attempting to resolve conflict