Add license file.
Update README.md
Repair conflict.