add license and remove 'lang' in index.js
fix conflicts