Added a test for the merging of a dir and a non-dir with the same name.