merge with the work folders