Fixing typos in README
Fix conflict