first commit
fixed merge conflict of license.md