fixes #6832
Merge pull request #6833 from dotCMS/issue-6832-unable-to-push-HTML-page-after-fixing-conflicts

fixes #6832