sentence: That year , the financier J P Morgan engineered a merger of Edison General Electric with Thomson-Houston that basically put the board of Thomson-Houston in charge of the new company called General Electric ( dropping `` Edison '' from its name ) .
question: what was _ merging _ with something ?
answers: Edison General Electric