deleted conflict code