resolving pet conflicts