cleanup when analysing new paths in dir2
print conflicts list before asking the user
Output formatting improvements
Merge branch 'newformat'
output improvements: print lines...