Update README
Fix merge