merging
remove empty folder