Resolving Conflict Sooner