fix bugs in fileconflicts code and prepare for aliased dirs