Updated README
Updated README: conflict myself fix