Conflict resolution for automata