modify README
modify README - fixed merge conflict