new version
add license
fix conflicts