resolve folder names conflict