initial commit
add README, LICENSE
fix conflict