folders merging on server