add jsns
add test
solve conflict
solve conflict again