README typos
README typos
Fix conflicts