Dispute over reopening California Tesla factory may be over