update README
removing main .md file
solve merge conflict