add calcSimilarity
merge conflict