clean out conflict code