fix the problem where we will constantly get conflicts on checkin because of directory structure differences