Dispute, conflict, or both. Understanding the difference can help you to better address a challenging situation.