updated license
fixed merge conflicts