Edit readme and add screenshot
fix conflict