update readme.md
delete the 1st line
add a line on the master
conflict fixed
add a line
merge with no-ff