Conflicting folder deleted