merging in license resolutions from master branch (crudely)