Update title and README
Fix merge conflict