cleanup
add licnese
Update LICENSE
merge conflict