Update README
Fix Merge Conflict