fix license
resolving conflicts
resolve README.md merge conflit