Resolve merge conflict in LICENSE

Fixes #117