add option to merge dirs + folders