fix dir and file confilction