initial commit
fix readme merge conflict