add readme
merge conflicts