Deleted conflict file