add npm check
fix merge conflict