add screenshot
del conflict file