updated license
fixed merge conflict