deleted conflict test