[Change] directory conflict
[Add] directory  conflict resolver test case