created Readme
merge conflict fix