updated readme with screenshot
fixed merge conflit in readme