merged with folder on Work PC