fixing the license

the old license file seems to be an incomplete merge