removes conflict tag
Merge pull request #8694 from KA101/fix

removes conflict tag