fix folder overlaps