upstream function added "word_intersection" after resolved merge