merge from npm