this needs Conflicts after all:
-rw-r--r-- 52 .gitignore
drwxr-xr-x - debian