changed fs_mkdirs
resolved conflict