find and fix within bug, up version for npm release
up versions and fix merge conflict