I'm not a Mac user, but I'm pretty sure I have seen links to a free tool that will merge folders (instead of replacing the old folder with the new as the mac does on its own). I think you can also do it through Terminal with a command line, though I don't know how easy that is on a Mac.