Directory conflict resolve