text1: Who was the War of Currents waged between?
text2: The competition resulted in Edison Machine Works pursuing AC development in 1890 and by 1892 Thomas Edison was no longer in control of his own company, which was consolidated into the conglomerate General Electric and converting to an AC delivery system at that point.