[#11343] Remove conflict code
Merge pull request #47 from previousnext/11343-update-notice-block

[#11343] Remove conflict code