Update README and screenshot.
Fix conflicts.