Title: Managing and Resolving Conflict