Update readme
Add icon
Fix merge conflict