update README from merge conflict