Feature/deal conflict1