Add LICENSE
Fix merge conflict
Merge Fix