deleted conflict file