resolved merge, added bigrams