Merge two license files

British or American english? :smile: