beging similarity algorithm
resolve merge conflict