Resolving conflicts with care

Resolving conflicts with care