Resolving (Intentional) Conflicts