Between You and Me: Solving Conflict