License update
Readme
Conflicts