Split up the conflict checker again, this time into six different
drwxr-xr-x - citadel
drwxr-xr-x - contrib
drwxr-xr-x - ctdlphp
drwxr-xr-x - libcitadel
drwxr-xr-x - webcit