new npm version
fix conflict