fix README merge conflict- wouldn't get this conflict but the reason is I updated the README directly from git console that day