fold duplicate Conflicts: lines, to make newer debuild happy
drwxr-xr-x - common
-rw-r--r-- 105 config.todo
drwxr-xr-x - debian
drwxr-xr-x - guest
drwxr-xr-x - host