removed message of merge
Merge pull request #5304 from faxriddin/master

solved conflict