fixed directory conflict bug