fixes #5866
Merge pull request #5869 from dotCMS/issue-5866-problems-fixing-structure-conflicts-in-remote

fixes #5866