Merge pull request #575 from slsyy/master

check also directories in check_case_conflict