Add change to README
Fix merge conflicts