fixes #5865
Merge pull request #6017 from dotCMS/issue-5865-disable-fix-discard-buttons-after-fixing-discarding-conflcits

fixes #5865