[#11343] Remove conflict code