A new way to resolve conflict is coming