We Can Work It Out: Resolving Conflicts