jaccard.py
resolved conflict