pet conflict resolution