The fix for this is simply configuring both clients to use the same folder name. Then move all items from the one you plan to remove to the one you plan to keep. Then remove the undesired folder.