fixes #5902
Merge pull request #5903 from dotCMS/issue-5902-error-when-deleting-conflicted-folder-and-running-fix

fixes #5902