merge in the greedy factoid fix