Add screenshot.
Fix conflicts.