some thing
resolved conflict
add test with lambdas