changed dir and conflict res