Resolving Conflicts: We Can Work It Out