no, it seems they have indeed merged, but they both had different names and the folder that disappeared wasn't the folder I altered.